aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2005-06-24 01:05:33 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-24 03:06:43 -0400
commit52c1da39534fb382c061de58b65f678ad74b59f5 (patch)
tree92b18695f23afbc99374f844445f555a198978f2 /drivers
parentd763b7a4736e219528f77bf6bc75dd78b1d75c03 (diff)
[PATCH] make various thing static
Another rollup of patches which give various symbols static scope Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/common/saa7146_fops.c2
-rw-r--r--drivers/media/video/tvaudio.c22
-rw-r--r--drivers/scsi/hosts.c2
-rw-r--r--drivers/scsi/scsi.c6
-rw-r--r--drivers/scsi/scsi_debug.c2
-rw-r--r--drivers/scsi/scsi_lib.c2
-rw-r--r--drivers/scsi/scsi_priv.h4
-rw-r--r--drivers/scsi/scsi_sysfs.c4
8 files changed, 21 insertions, 23 deletions
diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c
index cb826c9adfe7..c04fd11526e0 100644
--- a/drivers/media/common/saa7146_fops.c
+++ b/drivers/media/common/saa7146_fops.c
@@ -403,7 +403,7 @@ static struct file_operations video_fops =
403 .llseek = no_llseek, 403 .llseek = no_llseek,
404}; 404};
405 405
406void vv_callback(struct saa7146_dev *dev, unsigned long status) 406static void vv_callback(struct saa7146_dev *dev, unsigned long status)
407{ 407{
408 u32 isr = status; 408 u32 isr = status;
409 409
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index 5430b25b910d..9a493bea76d8 100644
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -1236,17 +1236,17 @@ static int ta8874z_checkit(struct CHIPSTATE *chip)
1236/* audio chip descriptions - struct CHIPDESC */ 1236/* audio chip descriptions - struct CHIPDESC */
1237 1237
1238/* insmod options to enable/disable individual audio chips */ 1238/* insmod options to enable/disable individual audio chips */
1239int tda8425 = 1; 1239static int tda8425 = 1;
1240int tda9840 = 1; 1240static int tda9840 = 1;
1241int tda9850 = 1; 1241static int tda9850 = 1;
1242int tda9855 = 1; 1242static int tda9855 = 1;
1243int tda9873 = 1; 1243static int tda9873 = 1;
1244int tda9874a = 1; 1244static int tda9874a = 1;
1245int tea6300 = 0; // address clash with msp34xx 1245static int tea6300 = 0; // address clash with msp34xx
1246int tea6320 = 0; // address clash with msp34xx 1246static int tea6320 = 0; // address clash with msp34xx
1247int tea6420 = 1; 1247static int tea6420 = 1;
1248int pic16c54 = 1; 1248static int pic16c54 = 1;
1249int ta8874z = 0; // address clash with tda9840 1249static int ta8874z = 0; // address clash with tda9840
1250 1250
1251module_param(tda8425, int, 0444); 1251module_param(tda8425, int, 0444);
1252module_param(tda9840, int, 0444); 1252module_param(tda9840, int, 0444);
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index ba347576d99b..d7a38b6713f9 100644
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -56,7 +56,7 @@ static struct class shost_class = {
56 * @shost: pointer to struct Scsi_Host 56 * @shost: pointer to struct Scsi_Host
57 * recovery: recovery requested to run. 57 * recovery: recovery requested to run.
58 **/ 58 **/
59void scsi_host_cancel(struct Scsi_Host *shost, int recovery) 59static void scsi_host_cancel(struct Scsi_Host *shost, int recovery)
60{ 60{
61 struct scsi_device *sdev; 61 struct scsi_device *sdev;
62 62
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 5578ae9a9e45..1cb5f7d4f278 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -68,6 +68,8 @@
68#include "scsi_priv.h" 68#include "scsi_priv.h"
69#include "scsi_logging.h" 69#include "scsi_logging.h"
70 70
71static void scsi_done(struct scsi_cmnd *cmd);
72static int scsi_retry_command(struct scsi_cmnd *cmd);
71 73
72/* 74/*
73 * Definitions and constants. 75 * Definitions and constants.
@@ -741,7 +743,7 @@ static DEFINE_PER_CPU(struct list_head, scsi_done_q);
741 * 743 *
742 * This function is interrupt context safe. 744 * This function is interrupt context safe.
743 */ 745 */
744void scsi_done(struct scsi_cmnd *cmd) 746static void scsi_done(struct scsi_cmnd *cmd)
745{ 747{
746 /* 748 /*
747 * We don't have to worry about this one timing out any more. 749 * We don't have to worry about this one timing out any more.
@@ -836,7 +838,7 @@ static void scsi_softirq(struct softirq_action *h)
836 * level drivers should not become re-entrant as a result of 838 * level drivers should not become re-entrant as a result of
837 * this. 839 * this.
838 */ 840 */
839int scsi_retry_command(struct scsi_cmnd *cmd) 841static int scsi_retry_command(struct scsi_cmnd *cmd)
840{ 842{
841 /* 843 /*
842 * Restore the SCSI command state. 844 * Restore the SCSI command state.
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index e0208886b45e..322b5a41a36f 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -1783,7 +1783,7 @@ static void __exit scsi_debug_exit(void)
1783device_initcall(scsi_debug_init); 1783device_initcall(scsi_debug_init);
1784module_exit(scsi_debug_exit); 1784module_exit(scsi_debug_exit);
1785 1785
1786void pseudo_0_release(struct device * dev) 1786static void pseudo_0_release(struct device * dev)
1787{ 1787{
1788 if (SCSI_DEBUG_OPT_NOISE & scsi_debug_opts) 1788 if (SCSI_DEBUG_OPT_NOISE & scsi_debug_opts)
1789 printk(KERN_INFO "scsi_debug: pseudo_0_release() called\n"); 1789 printk(KERN_INFO "scsi_debug: pseudo_0_release() called\n");
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 9f996499fa9d..621dee8b8cb2 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -44,7 +44,7 @@ struct scsi_host_sg_pool {
44#endif 44#endif
45 45
46#define SP(x) { x, "sgpool-" #x } 46#define SP(x) { x, "sgpool-" #x }
47struct scsi_host_sg_pool scsi_sg_pools[] = { 47static struct scsi_host_sg_pool scsi_sg_pools[] = {
48 SP(8), 48 SP(8),
49 SP(16), 49 SP(16),
50 SP(32), 50 SP(32),
diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h
index c01580df4476..96d4f745975c 100644
--- a/drivers/scsi/scsi_priv.h
+++ b/drivers/scsi/scsi_priv.h
@@ -61,8 +61,6 @@ extern void scsi_exit_hosts(void);
61extern int scsi_dispatch_cmd(struct scsi_cmnd *cmd); 61extern int scsi_dispatch_cmd(struct scsi_cmnd *cmd);
62extern int scsi_setup_command_freelist(struct Scsi_Host *shost); 62extern int scsi_setup_command_freelist(struct Scsi_Host *shost);
63extern void scsi_destroy_command_freelist(struct Scsi_Host *shost); 63extern void scsi_destroy_command_freelist(struct Scsi_Host *shost);
64extern void scsi_done(struct scsi_cmnd *cmd);
65extern int scsi_retry_command(struct scsi_cmnd *cmd);
66extern int scsi_insert_special_req(struct scsi_request *sreq, int); 64extern int scsi_insert_special_req(struct scsi_request *sreq, int);
67extern void scsi_init_cmd_from_req(struct scsi_cmnd *cmd, 65extern void scsi_init_cmd_from_req(struct scsi_cmnd *cmd,
68 struct scsi_request *sreq); 66 struct scsi_request *sreq);
@@ -136,7 +134,6 @@ extern void scsi_exit_sysctl(void);
136#endif /* CONFIG_SYSCTL */ 134#endif /* CONFIG_SYSCTL */
137 135
138/* scsi_sysfs.c */ 136/* scsi_sysfs.c */
139extern void scsi_device_dev_release(struct device *);
140extern int scsi_sysfs_add_sdev(struct scsi_device *); 137extern int scsi_sysfs_add_sdev(struct scsi_device *);
141extern int scsi_sysfs_add_host(struct Scsi_Host *); 138extern int scsi_sysfs_add_host(struct Scsi_Host *);
142extern int scsi_sysfs_register(void); 139extern int scsi_sysfs_register(void);
@@ -145,7 +142,6 @@ extern void scsi_sysfs_device_initialize(struct scsi_device *);
145extern int scsi_sysfs_target_initialize(struct scsi_device *); 142extern int scsi_sysfs_target_initialize(struct scsi_device *);
146extern struct scsi_transport_template blank_transport_template; 143extern struct scsi_transport_template blank_transport_template;
147 144
148extern struct class sdev_class;
149extern struct bus_type scsi_bus_type; 145extern struct bus_type scsi_bus_type;
150 146
151/* 147/*
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index 93b41100a6d8..beed7fbe1cbe 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -150,7 +150,7 @@ static void scsi_device_cls_release(struct class_device *class_dev)
150 put_device(&sdev->sdev_gendev); 150 put_device(&sdev->sdev_gendev);
151} 151}
152 152
153void scsi_device_dev_release(struct device *dev) 153static void scsi_device_dev_release(struct device *dev)
154{ 154{
155 struct scsi_device *sdev; 155 struct scsi_device *sdev;
156 struct device *parent; 156 struct device *parent;
@@ -185,7 +185,7 @@ void scsi_device_dev_release(struct device *dev)
185 put_device(parent); 185 put_device(parent);
186} 186}
187 187
188struct class sdev_class = { 188static struct class sdev_class = {
189 .name = "scsi_device", 189 .name = "scsi_device",
190 .release = scsi_device_cls_release, 190 .release = scsi_device_cls_release,
191}; 191};