diff options
author | Adrian Bunk <bunk@stusta.de> | 2007-07-09 14:59:59 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.localdomain> | 2007-07-18 12:16:32 -0400 |
commit | 44818efbad185eea75adad0e8cab97650a7370ab (patch) | |
tree | 0c0b3b856c390b1abb8071503d590dbb64731b1e | |
parent | 9d720d82dc295521d70939c3f5edd54050730f09 (diff) |
[SCSI] small cleanups
This patch contains the following cleanups:
- make needlessly global functions static
- every file should #include the headers containing the prototypes for
it's global functions
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
-rw-r--r-- | drivers/scsi/scsi_sysctl.c | 1 | ||||
-rw-r--r-- | drivers/scsi/scsi_sysfs.c | 3 | ||||
-rw-r--r-- | drivers/scsi/scsi_transport_fc.c | 2 | ||||
-rw-r--r-- | drivers/scsi/sr.c | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/drivers/scsi/scsi_sysctl.c b/drivers/scsi/scsi_sysctl.c index 6cfaaa2d0c81..63a30f566f3a 100644 --- a/drivers/scsi/scsi_sysctl.c +++ b/drivers/scsi/scsi_sysctl.c | |||
@@ -9,6 +9,7 @@ | |||
9 | #include <linux/sysctl.h> | 9 | #include <linux/sysctl.h> |
10 | 10 | ||
11 | #include "scsi_logging.h" | 11 | #include "scsi_logging.h" |
12 | #include "scsi_priv.h" | ||
12 | 13 | ||
13 | 14 | ||
14 | static ctl_table scsi_table[] = { | 15 | static ctl_table scsi_table[] = { |
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c index ed720863ab97..34e483d31c18 100644 --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c | |||
@@ -16,6 +16,7 @@ | |||
16 | #include <scsi/scsi_host.h> | 16 | #include <scsi/scsi_host.h> |
17 | #include <scsi/scsi_tcq.h> | 17 | #include <scsi/scsi_tcq.h> |
18 | #include <scsi/scsi_transport.h> | 18 | #include <scsi/scsi_transport.h> |
19 | #include <scsi/scsi_driver.h> | ||
19 | 20 | ||
20 | #include "scsi_priv.h" | 21 | #include "scsi_priv.h" |
21 | #include "scsi_logging.h" | 22 | #include "scsi_logging.h" |
@@ -803,7 +804,7 @@ void scsi_remove_device(struct scsi_device *sdev) | |||
803 | } | 804 | } |
804 | EXPORT_SYMBOL(scsi_remove_device); | 805 | EXPORT_SYMBOL(scsi_remove_device); |
805 | 806 | ||
806 | void __scsi_remove_target(struct scsi_target *starget) | 807 | static void __scsi_remove_target(struct scsi_target *starget) |
807 | { | 808 | { |
808 | struct Scsi_Host *shost = dev_to_shost(starget->dev.parent); | 809 | struct Scsi_Host *shost = dev_to_shost(starget->dev.parent); |
809 | unsigned long flags; | 810 | unsigned long flags; |
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c index e8825709797e..47057254850d 100644 --- a/drivers/scsi/scsi_transport_fc.c +++ b/drivers/scsi/scsi_transport_fc.c | |||
@@ -2358,7 +2358,7 @@ fc_rport_final_delete(struct work_struct *work) | |||
2358 | * Notes: | 2358 | * Notes: |
2359 | * This routine assumes no locks are held on entry. | 2359 | * This routine assumes no locks are held on entry. |
2360 | **/ | 2360 | **/ |
2361 | struct fc_rport * | 2361 | static struct fc_rport * |
2362 | fc_rport_create(struct Scsi_Host *shost, int channel, | 2362 | fc_rport_create(struct Scsi_Host *shost, int channel, |
2363 | struct fc_rport_identifiers *ids) | 2363 | struct fc_rport_identifiers *ids) |
2364 | { | 2364 | { |
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index 5143c8990845..e7b6a7fde1cb 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c | |||
@@ -175,7 +175,7 @@ static void scsi_cd_put(struct scsi_cd *cd) | |||
175 | * an inode for that to work, and we do not always have one. | 175 | * an inode for that to work, and we do not always have one. |
176 | */ | 176 | */ |
177 | 177 | ||
178 | int sr_media_change(struct cdrom_device_info *cdi, int slot) | 178 | static int sr_media_change(struct cdrom_device_info *cdi, int slot) |
179 | { | 179 | { |
180 | struct scsi_cd *cd = cdi->handle; | 180 | struct scsi_cd *cd = cdi->handle; |
181 | int retval; | 181 | int retval; |