[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>

authored by Adrian Bunk and committed by Linus Torvalds 52c1da39 d763b7a4

+40 -38
+1 -1
drivers/media/common/saa7146_fops.c
··· 403 .llseek = no_llseek, 404 }; 405 406 - void vv_callback(struct saa7146_dev *dev, unsigned long status) 407 { 408 u32 isr = status; 409
··· 403 .llseek = no_llseek, 404 }; 405 406 + static void vv_callback(struct saa7146_dev *dev, unsigned long status) 407 { 408 u32 isr = status; 409
+11 -11
drivers/media/video/tvaudio.c
··· 1236 /* audio chip descriptions - struct CHIPDESC */ 1237 1238 /* insmod options to enable/disable individual audio chips */ 1239 - int tda8425 = 1; 1240 - int tda9840 = 1; 1241 - int tda9850 = 1; 1242 - int tda9855 = 1; 1243 - int tda9873 = 1; 1244 - int tda9874a = 1; 1245 - int tea6300 = 0; // address clash with msp34xx 1246 - int tea6320 = 0; // address clash with msp34xx 1247 - int tea6420 = 1; 1248 - int pic16c54 = 1; 1249 - int ta8874z = 0; // address clash with tda9840 1250 1251 module_param(tda8425, int, 0444); 1252 module_param(tda9840, int, 0444);
··· 1236 /* audio chip descriptions - struct CHIPDESC */ 1237 1238 /* insmod options to enable/disable individual audio chips */ 1239 + static int tda8425 = 1; 1240 + static int tda9840 = 1; 1241 + static int tda9850 = 1; 1242 + static int tda9855 = 1; 1243 + static int tda9873 = 1; 1244 + static int tda9874a = 1; 1245 + static int tea6300 = 0; // address clash with msp34xx 1246 + static int tea6320 = 0; // address clash with msp34xx 1247 + static int tea6420 = 1; 1248 + static int pic16c54 = 1; 1249 + static int ta8874z = 0; // address clash with tda9840 1250 1251 module_param(tda8425, int, 0444); 1252 module_param(tda9840, int, 0444);
+1 -1
drivers/scsi/hosts.c
··· 56 * @shost: pointer to struct Scsi_Host 57 * recovery: recovery requested to run. 58 **/ 59 - void scsi_host_cancel(struct Scsi_Host *shost, int recovery) 60 { 61 struct scsi_device *sdev; 62
··· 56 * @shost: pointer to struct Scsi_Host 57 * recovery: recovery requested to run. 58 **/ 59 + static void scsi_host_cancel(struct Scsi_Host *shost, int recovery) 60 { 61 struct scsi_device *sdev; 62
+4 -2
drivers/scsi/scsi.c
··· 68 #include "scsi_priv.h" 69 #include "scsi_logging.h" 70 71 72 /* 73 * Definitions and constants. ··· 743 * 744 * This function is interrupt context safe. 745 */ 746 - void scsi_done(struct scsi_cmnd *cmd) 747 { 748 /* 749 * We don't have to worry about this one timing out any more. ··· 838 * level drivers should not become re-entrant as a result of 839 * this. 840 */ 841 - int scsi_retry_command(struct scsi_cmnd *cmd) 842 { 843 /* 844 * Restore the SCSI command state.
··· 68 #include "scsi_priv.h" 69 #include "scsi_logging.h" 70 71 + static void scsi_done(struct scsi_cmnd *cmd); 72 + static int scsi_retry_command(struct scsi_cmnd *cmd); 73 74 /* 75 * Definitions and constants. ··· 741 * 742 * This function is interrupt context safe. 743 */ 744 + static void scsi_done(struct scsi_cmnd *cmd) 745 { 746 /* 747 * We don't have to worry about this one timing out any more. ··· 836 * level drivers should not become re-entrant as a result of 837 * this. 838 */ 839 + static int scsi_retry_command(struct scsi_cmnd *cmd) 840 { 841 /* 842 * Restore the SCSI command state.
+1 -1
drivers/scsi/scsi_debug.c
··· 1783 device_initcall(scsi_debug_init); 1784 module_exit(scsi_debug_exit); 1785 1786 - void pseudo_0_release(struct device * dev) 1787 { 1788 if (SCSI_DEBUG_OPT_NOISE & scsi_debug_opts) 1789 printk(KERN_INFO "scsi_debug: pseudo_0_release() called\n");
··· 1783 device_initcall(scsi_debug_init); 1784 module_exit(scsi_debug_exit); 1785 1786 + static void pseudo_0_release(struct device * dev) 1787 { 1788 if (SCSI_DEBUG_OPT_NOISE & scsi_debug_opts) 1789 printk(KERN_INFO "scsi_debug: pseudo_0_release() called\n");
+1 -1
drivers/scsi/scsi_lib.c
··· 44 #endif 45 46 #define SP(x) { x, "sgpool-" #x } 47 - struct scsi_host_sg_pool scsi_sg_pools[] = { 48 SP(8), 49 SP(16), 50 SP(32),
··· 44 #endif 45 46 #define SP(x) { x, "sgpool-" #x } 47 + static struct scsi_host_sg_pool scsi_sg_pools[] = { 48 SP(8), 49 SP(16), 50 SP(32),
-4
drivers/scsi/scsi_priv.h
··· 61 extern int scsi_dispatch_cmd(struct scsi_cmnd *cmd); 62 extern int scsi_setup_command_freelist(struct Scsi_Host *shost); 63 extern void scsi_destroy_command_freelist(struct Scsi_Host *shost); 64 - extern void scsi_done(struct scsi_cmnd *cmd); 65 - extern int scsi_retry_command(struct scsi_cmnd *cmd); 66 extern int scsi_insert_special_req(struct scsi_request *sreq, int); 67 extern void scsi_init_cmd_from_req(struct scsi_cmnd *cmd, 68 struct scsi_request *sreq); ··· 134 #endif /* CONFIG_SYSCTL */ 135 136 /* scsi_sysfs.c */ 137 - extern void scsi_device_dev_release(struct device *); 138 extern int scsi_sysfs_add_sdev(struct scsi_device *); 139 extern int scsi_sysfs_add_host(struct Scsi_Host *); 140 extern int scsi_sysfs_register(void); ··· 142 extern int scsi_sysfs_target_initialize(struct scsi_device *); 143 extern struct scsi_transport_template blank_transport_template; 144 145 - extern struct class sdev_class; 146 extern struct bus_type scsi_bus_type; 147 148 /*
··· 61 extern int scsi_dispatch_cmd(struct scsi_cmnd *cmd); 62 extern int scsi_setup_command_freelist(struct Scsi_Host *shost); 63 extern void scsi_destroy_command_freelist(struct Scsi_Host *shost); 64 extern int scsi_insert_special_req(struct scsi_request *sreq, int); 65 extern void scsi_init_cmd_from_req(struct scsi_cmnd *cmd, 66 struct scsi_request *sreq); ··· 136 #endif /* CONFIG_SYSCTL */ 137 138 /* scsi_sysfs.c */ 139 extern int scsi_sysfs_add_sdev(struct scsi_device *); 140 extern int scsi_sysfs_add_host(struct Scsi_Host *); 141 extern int scsi_sysfs_register(void); ··· 145 extern int scsi_sysfs_target_initialize(struct scsi_device *); 146 extern struct scsi_transport_template blank_transport_template; 147 148 extern struct bus_type scsi_bus_type; 149 150 /*
+2 -2
drivers/scsi/scsi_sysfs.c
··· 150 put_device(&sdev->sdev_gendev); 151 } 152 153 - void scsi_device_dev_release(struct device *dev) 154 { 155 struct scsi_device *sdev; 156 struct device *parent; ··· 185 put_device(parent); 186 } 187 188 - struct class sdev_class = { 189 .name = "scsi_device", 190 .release = scsi_device_cls_release, 191 };
··· 150 put_device(&sdev->sdev_gendev); 151 } 152 153 + static void scsi_device_dev_release(struct device *dev) 154 { 155 struct scsi_device *sdev; 156 struct device *parent; ··· 185 put_device(parent); 186 } 187 188 + static struct class sdev_class = { 189 .name = "scsi_device", 190 .release = scsi_device_cls_release, 191 };
+1 -1
fs/namespace.c
··· 337 338 EXPORT_SYMBOL(may_umount); 339 340 - void umount_tree(struct vfsmount *mnt) 341 { 342 struct vfsmount *p; 343 LIST_HEAD(kill);
··· 337 338 EXPORT_SYMBOL(may_umount); 339 340 + static void umount_tree(struct vfsmount *mnt) 341 { 342 struct vfsmount *p; 343 LIST_HEAD(kill);
+1 -1
fs/reiserfs/stree.c
··· 223 const struct reiserfs_key MIN_KEY = {0, 0, {{0, 0},}}; 224 225 /* Maximal possible key. It is never in the tree. */ 226 - const struct reiserfs_key MAX_KEY = { 227 __constant_cpu_to_le32(0xffffffff), 228 __constant_cpu_to_le32(0xffffffff), 229 {{__constant_cpu_to_le32(0xffffffff),
··· 223 const struct reiserfs_key MIN_KEY = {0, 0, {{0, 0},}}; 224 225 /* Maximal possible key. It is never in the tree. */ 226 + static const struct reiserfs_key MAX_KEY = { 227 __constant_cpu_to_le32(0xffffffff), 228 __constant_cpu_to_le32(0xffffffff), 229 {{__constant_cpu_to_le32(0xffffffff),
-1
include/linux/irq.h
··· 88 struct irqaction *action); 89 extern fastcall unsigned int __do_IRQ(unsigned int irq, struct pt_regs *regs); 90 extern void note_interrupt(unsigned int irq, irq_desc_t *desc, int action_ret); 91 - extern void report_bad_irq(unsigned int irq, irq_desc_t *desc, int action_ret); 92 extern int can_request_irq(unsigned int irq, unsigned long irqflags); 93 94 extern void init_irq_proc(void);
··· 88 struct irqaction *action); 89 extern fastcall unsigned int __do_IRQ(unsigned int irq, struct pt_regs *regs); 90 extern void note_interrupt(unsigned int irq, irq_desc_t *desc, int action_ret); 91 extern int can_request_irq(unsigned int irq, unsigned long irqflags); 92 93 extern void init_irq_proc(void);
-1
include/linux/namespace.h
··· 12 struct rw_semaphore sem; 13 }; 14 15 - extern void umount_tree(struct vfsmount *); 16 extern int copy_namespace(int, struct task_struct *); 17 extern void __put_namespace(struct namespace *namespace); 18
··· 12 struct rw_semaphore sem; 13 }; 14 15 extern int copy_namespace(int, struct task_struct *); 16 extern void __put_namespace(struct namespace *namespace); 17
-6
include/net/sctp/sm.h
··· 131 sctp_state_fn_t sctp_sf_ootb; 132 sctp_state_fn_t sctp_sf_pdiscard; 133 sctp_state_fn_t sctp_sf_violation; 134 - sctp_state_fn_t sctp_sf_violation_chunklen; 135 sctp_state_fn_t sctp_sf_discard_chunk; 136 sctp_state_fn_t sctp_sf_do_5_2_1_siminit; 137 sctp_state_fn_t sctp_sf_do_5_2_2_dupinit; ··· 257 258 void sctp_chunk_assign_tsn(struct sctp_chunk *); 259 void sctp_chunk_assign_ssn(struct sctp_chunk *); 260 - 261 - sctp_disposition_t sctp_stop_t1_and_abort(sctp_cmd_seq_t *commands, 262 - __u16 error, 263 - const struct sctp_association *asoc, 264 - struct sctp_transport *transport); 265 266 /* Prototypes for statetable processing. */ 267
··· 131 sctp_state_fn_t sctp_sf_ootb; 132 sctp_state_fn_t sctp_sf_pdiscard; 133 sctp_state_fn_t sctp_sf_violation; 134 sctp_state_fn_t sctp_sf_discard_chunk; 135 sctp_state_fn_t sctp_sf_do_5_2_1_siminit; 136 sctp_state_fn_t sctp_sf_do_5_2_2_dupinit; ··· 258 259 void sctp_chunk_assign_tsn(struct sctp_chunk *); 260 void sctp_chunk_assign_ssn(struct sctp_chunk *); 261 262 /* Prototypes for statetable processing. */ 263
+1 -1
kernel/irq/spurious.c
··· 45 } 46 } 47 48 - void report_bad_irq(unsigned int irq, irq_desc_t *desc, irqreturn_t action_ret) 49 { 50 static int count = 100; 51
··· 45 } 46 } 47 48 + static void report_bad_irq(unsigned int irq, irq_desc_t *desc, irqreturn_t action_ret) 49 { 50 static int count = 100; 51
+1 -1
kernel/module.c
··· 730 return 0; 731 } 732 733 - int set_obsolete(const char *val, struct kernel_param *kp) 734 { 735 unsigned int min, max; 736 unsigned int size, maxsize;
··· 730 return 0; 731 } 732 733 + static int set_obsolete(const char *val, struct kernel_param *kp) 734 { 735 unsigned int min, max; 736 unsigned int size, maxsize;
+1 -1
kernel/power/swsusp.c
··· 81 extern char resume_file[]; 82 83 /* Local variables that should not be affected by save */ 84 - unsigned int nr_copy_pages __nosavedata = 0; 85 86 /* Suspend pagedir is allocated before final copy, therefore it 87 must be freed after resume
··· 81 extern char resume_file[]; 82 83 /* Local variables that should not be affected by save */ 84 + static unsigned int nr_copy_pages __nosavedata = 0; 85 86 /* Suspend pagedir is allocated before final copy, therefore it 87 must be freed after resume
+14 -2
net/sctp/sm_statefuns.c
··· 92 sctp_cmd_seq_t *commands); 93 static struct sctp_sackhdr *sctp_sm_pull_sack(struct sctp_chunk *chunk); 94 95 96 /* Small helper function that checks if the chunk length 97 * is of the appropriate length. The 'required_length' argument ··· 2339 * 2340 * This is common code called by several sctp_sf_*_abort() functions above. 2341 */ 2342 - sctp_disposition_t sctp_stop_t1_and_abort(sctp_cmd_seq_t *commands, 2343 __u16 error, 2344 const struct sctp_association *asoc, 2345 struct sctp_transport *transport) ··· 3698 * 3699 * Generate an ABORT chunk and terminate the association. 3700 */ 3701 - sctp_disposition_t sctp_sf_violation_chunklen(const struct sctp_endpoint *ep, 3702 const struct sctp_association *asoc, 3703 const sctp_subtype_t type, 3704 void *arg,
··· 92 sctp_cmd_seq_t *commands); 93 static struct sctp_sackhdr *sctp_sm_pull_sack(struct sctp_chunk *chunk); 94 95 + static sctp_disposition_t sctp_stop_t1_and_abort(sctp_cmd_seq_t *commands, 96 + __u16 error, 97 + const struct sctp_association *asoc, 98 + struct sctp_transport *transport); 99 + 100 + static sctp_disposition_t sctp_sf_violation_chunklen( 101 + const struct sctp_endpoint *ep, 102 + const struct sctp_association *asoc, 103 + const sctp_subtype_t type, 104 + void *arg, 105 + sctp_cmd_seq_t *commands); 106 107 /* Small helper function that checks if the chunk length 108 * is of the appropriate length. The 'required_length' argument ··· 2328 * 2329 * This is common code called by several sctp_sf_*_abort() functions above. 2330 */ 2331 + static sctp_disposition_t sctp_stop_t1_and_abort(sctp_cmd_seq_t *commands, 2332 __u16 error, 2333 const struct sctp_association *asoc, 2334 struct sctp_transport *transport) ··· 3687 * 3688 * Generate an ABORT chunk and terminate the association. 3689 */ 3690 + static sctp_disposition_t sctp_sf_violation_chunklen( 3691 + const struct sctp_endpoint *ep, 3692 const struct sctp_association *asoc, 3693 const sctp_subtype_t type, 3694 void *arg,