diff options
author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2009-06-04 21:09:38 +0200 |
---|---|---|
committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2009-06-05 16:26:17 +0200 |
commit | e8ca97021c8eb127bb04aec4e2420e1d66be371d (patch) | |
tree | bc9e6c3597eff48632f57903e5cd0d3456fe8d7a /drivers/firewire | |
parent | 3dcdc50079bc2c9dbc6524518976353f743f7ec8 (diff) | |
download | linux-stable-e8ca97021c8eb127bb04aec4e2420e1d66be371d.tar.gz linux-stable-e8ca97021c8eb127bb04aec4e2420e1d66be371d.tar.bz2 linux-stable-e8ca97021c8eb127bb04aec4e2420e1d66be371d.zip |
firewire: clean up includes
Include required headers which were only indirectly included.
Remove unused includes and an unused constant.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Diffstat (limited to 'drivers/firewire')
-rw-r--r-- | drivers/firewire/fw-card.c | 15 | ||||
-rw-r--r-- | drivers/firewire/fw-device.c | 3 | ||||
-rw-r--r-- | drivers/firewire/fw-iso.c | 2 | ||||
-rw-r--r-- | drivers/firewire/fw-ohci.c | 7 | ||||
-rw-r--r-- | drivers/firewire/fw-sbp2.c | 12 | ||||
-rw-r--r-- | drivers/firewire/fw-topology.c | 16 | ||||
-rw-r--r-- | drivers/firewire/fw-transaction.c | 28 |
7 files changed, 61 insertions, 22 deletions
diff --git a/drivers/firewire/fw-card.c b/drivers/firewire/fw-card.c index 8b8c8c22f0fc..b6f55e262e7f 100644 --- a/drivers/firewire/fw-card.c +++ b/drivers/firewire/fw-card.c @@ -16,18 +16,27 @@ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include <linux/bug.h> #include <linux/completion.h> #include <linux/crc-itu-t.h> -#include <linux/delay.h> #include <linux/device.h> #include <linux/errno.h> +#include <linux/jiffies.h> +#include <linux/kernel.h> #include <linux/kref.h> +#include <linux/list.h> #include <linux/module.h> #include <linux/mutex.h> +#include <linux/spinlock.h> +#include <linux/timer.h> +#include <linux/workqueue.h> + +#include <asm/atomic.h> +#include <asm/byteorder.h> -#include "fw-transaction.h" -#include "fw-topology.h" #include "fw-device.h" +#include "fw-topology.h" +#include "fw-transaction.h" int fw_compute_block_crc(u32 *block) { diff --git a/drivers/firewire/fw-device.c b/drivers/firewire/fw-device.c index 7d2f6135e009..238acac5badb 100644 --- a/drivers/firewire/fw-device.c +++ b/drivers/firewire/fw-device.c @@ -27,6 +27,7 @@ #include <linux/kobject.h> #include <linux/list.h> #include <linux/mod_devicetable.h> +#include <linux/module.h> #include <linux/mutex.h> #include <linux/rwsem.h> #include <linux/semaphore.h> @@ -34,6 +35,8 @@ #include <linux/string.h> #include <linux/workqueue.h> +#include <asm/atomic.h> +#include <asm/byteorder.h> #include <asm/system.h> #include "fw-device.h" diff --git a/drivers/firewire/fw-iso.c b/drivers/firewire/fw-iso.c index 2baf1007253e..0ff3e9c42eb1 100644 --- a/drivers/firewire/fw-iso.c +++ b/drivers/firewire/fw-iso.c @@ -28,6 +28,8 @@ #include <linux/spinlock.h> #include <linux/vmalloc.h> +#include <asm/byteorder.h> + #include "fw-topology.h" #include "fw-transaction.h" diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c index 1b6590f92543..d296d12909d6 100644 --- a/drivers/firewire/fw-ohci.c +++ b/drivers/firewire/fw-ohci.c @@ -20,18 +20,24 @@ #include <linux/compiler.h> #include <linux/delay.h> +#include <linux/device.h> #include <linux/dma-mapping.h> +#include <linux/firewire-constants.h> #include <linux/gfp.h> #include <linux/init.h> #include <linux/interrupt.h> +#include <linux/io.h> #include <linux/kernel.h> +#include <linux/list.h> #include <linux/mm.h> #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/pci.h> #include <linux/spinlock.h> +#include <linux/string.h> #include <asm/atomic.h> +#include <asm/byteorder.h> #include <asm/page.h> #include <asm/system.h> @@ -232,7 +238,6 @@ static inline struct fw_ohci *fw_ohci(struct fw_card *card) #define OHCI1394_MAX_AT_RESP_RETRIES 0x2 #define OHCI1394_MAX_PHYS_RESP_RETRIES 0x8 -#define FW_OHCI_MAJOR 240 #define OHCI1394_REGISTER_SIZE 0x800 #define OHCI_LOOP_COUNT 500 #define OHCI1394_PCI_HCI_Control 0x40 diff --git a/drivers/firewire/fw-sbp2.c b/drivers/firewire/fw-sbp2.c index 2a707754532b..027b91f4a6e7 100644 --- a/drivers/firewire/fw-sbp2.c +++ b/drivers/firewire/fw-sbp2.c @@ -30,18 +30,27 @@ #include <linux/blkdev.h> #include <linux/bug.h> +#include <linux/completion.h> #include <linux/delay.h> #include <linux/device.h> #include <linux/dma-mapping.h> +#include <linux/firewire-constants.h> +#include <linux/init.h> +#include <linux/jiffies.h> #include <linux/kernel.h> +#include <linux/kref.h> +#include <linux/list.h> #include <linux/mod_devicetable.h> #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/scatterlist.h> +#include <linux/slab.h> +#include <linux/spinlock.h> #include <linux/string.h> #include <linux/stringify.h> -#include <linux/timer.h> #include <linux/workqueue.h> + +#include <asm/byteorder.h> #include <asm/system.h> #include <scsi/scsi.h> @@ -50,7 +59,6 @@ #include <scsi/scsi_host.h> #include "fw-device.h" -#include "fw-topology.h" #include "fw-transaction.h" /* diff --git a/drivers/firewire/fw-topology.c b/drivers/firewire/fw-topology.c index d0deecc4de93..6d0ea1bb7e23 100644 --- a/drivers/firewire/fw-topology.c +++ b/drivers/firewire/fw-topology.c @@ -18,13 +18,21 @@ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include <linux/module.h> -#include <linux/wait.h> +#include <linux/bug.h> #include <linux/errno.h> -#include <asm/bug.h> +#include <linux/jiffies.h> +#include <linux/kernel.h> +#include <linux/list.h> +#include <linux/module.h> +#include <linux/slab.h> +#include <linux/spinlock.h> +#include <linux/string.h> + +#include <asm/atomic.h> #include <asm/system.h> -#include "fw-transaction.h" + #include "fw-topology.h" +#include "fw-transaction.h" #define SELF_ID_PHY_ID(q) (((q) >> 24) & 0x3f) #define SELF_ID_EXTENDED(q) (((q) >> 23) & 0x01) diff --git a/drivers/firewire/fw-transaction.c b/drivers/firewire/fw-transaction.c index 283dac6d327d..7008214e3336 100644 --- a/drivers/firewire/fw-transaction.c +++ b/drivers/firewire/fw-transaction.c @@ -18,24 +18,28 @@ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include <linux/bug.h> #include <linux/completion.h> +#include <linux/device.h> +#include <linux/errno.h> +#include <linux/firewire-constants.h> +#include <linux/fs.h> +#include <linux/init.h> #include <linux/idr.h> +#include <linux/jiffies.h> #include <linux/kernel.h> -#include <linux/kref.h> -#include <linux/module.h> -#include <linux/mutex.h> -#include <linux/init.h> -#include <linux/interrupt.h> -#include <linux/pci.h> -#include <linux/delay.h> -#include <linux/poll.h> #include <linux/list.h> -#include <linux/kthread.h> -#include <asm/uaccess.h> +#include <linux/module.h> +#include <linux/slab.h> +#include <linux/spinlock.h> +#include <linux/string.h> +#include <linux/timer.h> +#include <linux/types.h> + +#include <asm/byteorder.h> +#include "fw-device.h" /* for fw_device_ops */ #include "fw-transaction.h" -#include "fw-topology.h" -#include "fw-device.h" #define HEADER_PRI(pri) ((pri) << 0) #define HEADER_TCODE(tcode) ((tcode) << 4) |