Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit de70b4c87b8f1d484cf533536c0c6ce2e05101cf

Authored by Adrian Bunk
Committed by Jeff Garzik
1 parent 93ad4fb04f
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

[PATCH] drivers/net/tokenring/: cleanups 

This patch contains the follwing cleanups:
- make needlessly global code static
- remove obsolete Emacs settings

Signed-off-by: Adrian Bunk <bunk@stusta.de>

Showing 12 changed files with 21 additions and 90 deletions Side-by-side Diff

drivers/net/pcmcia/ibmtr_cs.c
Diff comments   View file @ de70b4c
... ... @@ -119,9 +119,6 @@
119 119  
120 120 static dev_link_t *dev_list;
121 121  
122   -extern int ibmtr_probe_card(struct net_device *dev);
123   -extern irqreturn_t tok_interrupt (int irq, void *dev_id, struct pt_regs *regs);
124   -
125 122 /*====================================================================*/
126 123  
127 124 typedef struct ibmtr_dev_t {
drivers/net/tokenring/3c359.c
Diff comments   View file @ de70b4c
... ... @@ -276,7 +276,8 @@
276 276 return ;
277 277 }
278 278  
279   -int __devinit xl_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
  279 +static int __devinit xl_probe(struct pci_dev *pdev,
  280 + const struct pci_device_id *ent)
280 281 {
281 282 struct net_device *dev ;
282 283 struct xl_private *xl_priv ;
drivers/net/tokenring/3c359_microcode.h
Diff comments   View file @ de70b4c
... ... @@ -22,7 +22,7 @@
22 22  
23 23 static int mc_size = 24880 ;
24 24  
25   -u8 microcode[] = {
  25 +static const u8 microcode[] = {
26 26 0xfe,0x3a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
27 27 ,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
28 28 ,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
drivers/net/tokenring/abyss.c
Diff comments   View file @ de70b4c
... ... @@ -467,16 +467,4 @@
467 467  
468 468 module_init(abyss_init);
469 469 module_exit(abyss_rmmod);
470   -
471   -
472   -/*
473   - * Local variables:
474   - * compile-command: "gcc -DMODVERSIONS -DMODULE -D__KERNEL__ -Wall -Wstrict-prototypes -O6 -fomit-frame-pointer -I/usr/src/linux/drivers/net/tokenring/ -c abyss.c"
475   - * alt-compile-command: "gcc -DMODULE -D__KERNEL__ -Wall -Wstrict-prototypes -O6 -fomit-frame-pointer -I/usr/src/linux/drivers/net/tokenring/ -c abyss.c"
476   - * c-set-style "K&R"
477   - * c-indent-level: 8
478   - * c-basic-offset: 8
479   - * tab-width: 8
480   - * End:
481   - */
drivers/net/tokenring/ibmtr.c
Diff comments   View file @ de70b4c
... ... @@ -151,7 +151,7 @@
151 151  
152 152 /* this allows displaying full adapter information */
153 153  
154   -char *channel_def[] __devinitdata = { "ISA", "MCA", "ISA P&P" };
  154 +static char *channel_def[] __devinitdata = { "ISA", "MCA", "ISA P&P" };
155 155  
156 156 static char pcchannelid[] __devinitdata = {
157 157 0x05, 0x00, 0x04, 0x09,
... ... @@ -171,7 +171,7 @@
171 171 0x03, 0x08, 0x02, 0x00
172 172 };
173 173  
174   -char __devinit *adapter_def(char type)
  174 +static char __devinit *adapter_def(char type)
175 175 {
176 176 switch (type) {
177 177 case 0xF: return "PC Adapter | PC Adapter II | Adapter/A";
... ... @@ -184,7 +184,7 @@
184 184  
185 185 #define TRC_INIT 0x01 /* Trace initialization & PROBEs */
186 186 #define TRC_INITV 0x02 /* verbose init trace points */
187   -unsigned char ibmtr_debug_trace = 0;
  187 +static unsigned char ibmtr_debug_trace = 0;
188 188  
189 189 static int ibmtr_probe(struct net_device *dev);
190 190 static int ibmtr_probe1(struct net_device *dev, int ioaddr);
191 191  
192 192  
193 193  
194 194  
... ... @@ -192,20 +192,20 @@
192 192 static int trdev_init(struct net_device *dev);
193 193 static int tok_open(struct net_device *dev);
194 194 static int tok_init_card(struct net_device *dev);
195   -void tok_open_adapter(unsigned long dev_addr);
  195 +static void tok_open_adapter(unsigned long dev_addr);
196 196 static void open_sap(unsigned char type, struct net_device *dev);
197 197 static void tok_set_multicast_list(struct net_device *dev);
198 198 static int tok_send_packet(struct sk_buff *skb, struct net_device *dev);
199 199 static int tok_close(struct net_device *dev);
200   -irqreturn_t tok_interrupt(int irq, void *dev_id, struct pt_regs *regs);
  200 +static irqreturn_t tok_interrupt(int irq, void *dev_id, struct pt_regs *regs);
201 201 static void initial_tok_int(struct net_device *dev);
202 202 static void tr_tx(struct net_device *dev);
203 203 static void tr_rx(struct net_device *dev);
204   -void ibmtr_reset_timer(struct timer_list*tmr,struct net_device *dev);
  204 +static void ibmtr_reset_timer(struct timer_list*tmr,struct net_device *dev);
205 205 static void tok_rerun(unsigned long dev_addr);
206   -void ibmtr_readlog(struct net_device *dev);
  206 +static void ibmtr_readlog(struct net_device *dev);
207 207 static struct net_device_stats *tok_get_stats(struct net_device *dev);
208   -int ibmtr_change_mtu(struct net_device *dev, int mtu);
  208 +static int ibmtr_change_mtu(struct net_device *dev, int mtu);
209 209 static void find_turbo_adapters(int *iolist);
210 210  
211 211 static int ibmtr_portlist[IBMTR_MAX_ADAPTERS+1] __devinitdata = {
... ... @@ -928,7 +928,7 @@
928 928 #define DLC_MAX_SAP_OFST 32
929 929 #define DLC_MAX_STA_OFST 33
930 930  
931   -void tok_open_adapter(unsigned long dev_addr)
  931 +static void tok_open_adapter(unsigned long dev_addr)
932 932 {
933 933 struct net_device *dev = (struct net_device *) dev_addr;
934 934 struct tok_info *ti;
... ... @@ -1099,7 +1099,7 @@
1099 1099 return ti->sram_virt + index;
1100 1100 }
1101 1101  
1102   -void dir_open_adapter (struct net_device *dev)
  1102 +static void dir_open_adapter (struct net_device *dev)
1103 1103 {
1104 1104 struct tok_info *ti = (struct tok_info *) dev->priv;
1105 1105 unsigned char ret_code;
... ... @@ -1172,7 +1172,7 @@
1172 1172  
1173 1173 /******************************************************************************/
1174 1174  
1175   -irqreturn_t tok_interrupt(int irq, void *dev_id, struct pt_regs *regs)
  1175 +static irqreturn_t tok_interrupt(int irq, void *dev_id, struct pt_regs *regs)
1176 1176 {
1177 1177 unsigned char status;
1178 1178 /* unsigned char status_even ; */
... ... @@ -1840,7 +1840,7 @@
1840 1840  
1841 1841 /*****************************************************************************/
1842 1842  
1843   -void ibmtr_reset_timer(struct timer_list *tmr, struct net_device *dev)
  1843 +static void ibmtr_reset_timer(struct timer_list *tmr, struct net_device *dev)
1844 1844 {
1845 1845 tmr->expires = jiffies + TR_RETRY_INTERVAL;
1846 1846 tmr->data = (unsigned long) dev;
... ... @@ -1872,7 +1872,7 @@
1872 1872  
1873 1873 /*****************************************************************************/
1874 1874  
1875   -void ibmtr_readlog(struct net_device *dev)
  1875 +static void ibmtr_readlog(struct net_device *dev)
1876 1876 {
1877 1877 struct tok_info *ti;
1878 1878  
... ... @@ -1905,7 +1905,7 @@
1905 1905  
1906 1906 /*****************************************************************************/
1907 1907  
1908   -int ibmtr_change_mtu(struct net_device *dev, int mtu)
  1908 +static int ibmtr_change_mtu(struct net_device *dev, int mtu)
1909 1909 {
1910 1910 struct tok_info *ti = (struct tok_info *) dev->priv;
1911 1911  
drivers/net/tokenring/madgemc.c
Diff comments   View file @ de70b4c
... ... @@ -625,7 +625,7 @@
625 625 /*
626 626 * Disable the board, and put back into power-up state.
627 627 */
628   -void madgemc_chipset_close(struct net_device *dev)
  628 +static void madgemc_chipset_close(struct net_device *dev)
629 629 {
630 630 /* disable interrupts */
631 631 madgemc_setint(dev, 0);
... ... @@ -785,16 +785,4 @@
785 785 module_exit(madgemc_exit);
786 786  
787 787 MODULE_LICENSE("GPL");
788   -
789   -
790   -/*
791   - * Local variables:
792   - * compile-command: "gcc -DMODVERSIONS -DMODULE -D__KERNEL__ -Wall -Wstrict-prototypes -O6 -fomit-frame-pointer -I/usr/src/linux/drivers/net/tokenring/ -c madgemc.c"
793   - * alt-compile-command: "gcc -DMODULE -D__KERNEL__ -Wall -Wstrict-prototypes -O6 -fomit-frame-pointer -I/usr/src/linux/drivers/net/tokenring/ -c madgemc.c"
794   - * c-set-style "K&R"
795   - * c-indent-level: 8
796   - * c-basic-offset: 8
797   - * tab-width: 8
798   - * End:
799   - */
drivers/net/tokenring/proteon.c
Diff comments   View file @ de70b4c
... ... @@ -418,16 +418,4 @@
418 418 }
419 419 }
420 420 #endif /* MODULE */
421   -
422   -
423   -/*
424   - * Local variables:
425   - * compile-command: "gcc -DMODVERSIONS -DMODULE -D__KERNEL__ -Wall -Wstrict-prototypes -O6 -fomit-frame-pointer -I/usr/src/linux/drivers/net/tokenring/ -c proteon.c"
426   - * alt-compile-command: "gcc -DMODULE -D__KERNEL__ -Wall -Wstrict-prototypes -O6 -fomit-frame-pointer -I/usr/src/linux/drivers/net/tokenring/ -c proteon.c"
427   - * c-set-style "K&R"
428   - * c-indent-level: 8
429   - * c-basic-offset: 8
430   - * tab-width: 8
431   - * End:
432   - */
drivers/net/tokenring/skisa.c
Diff comments   View file @ de70b4c
... ... @@ -428,16 +428,4 @@
428 428 }
429 429 }
430 430 #endif /* MODULE */
431   -
432   -
433   -/*
434   - * Local variables:
435   - * compile-command: "gcc -DMODVERSIONS -DMODULE -D__KERNEL__ -Wall -Wstrict-prototypes -O6 -fomit-frame-pointer -I/usr/src/linux/drivers/net/tokenring/ -c skisa.c"
436   - * alt-compile-command: "gcc -DMODULE -D__KERNEL__ -Wall -Wstrict-prototypes -O6 -fomit-frame-pointer -I/usr/src/linux/drivers/net/tokenring/ -c skisa.c"
437   - * c-set-style "K&R"
438   - * c-indent-level: 8
439   - * c-basic-offset: 8
440   - * tab-width: 8
441   - * End:
442   - */
drivers/net/tokenring/smctr.c
Diff comments   View file @ de70b4c
... ... @@ -77,7 +77,7 @@
77 77  
78 78 /* SMC Name of the Adapter. */
79 79 static char smctr_name[] = "SMC TokenCard";
80   -char *smctr_model = "Unknown";
  80 +static char *smctr_model = "Unknown";
81 81  
82 82 /* Use 0 for production, 1 for verification, 2 for debug, and
83 83 * 3 for very verbose debug.
drivers/net/tokenring/smctr_firmware.h
Diff comments   View file @ de70b4c
... ... @@ -21,7 +21,7 @@
21 21  
22 22 #if defined(CONFIG_SMCTR) || defined(CONFIG_SMCTR_MODULE)
23 23  
24   -unsigned char smctr_code[] = {
  24 +static const unsigned char smctr_code[] = {
25 25 0x0BC, 0x01D, 0x012, 0x03B, 0x063, 0x0B4, 0x0E9, 0x000,
26 26 0x000, 0x01F, 0x000, 0x001, 0x001, 0x000, 0x002, 0x005,
27 27 0x001, 0x000, 0x006, 0x003, 0x001, 0x000, 0x004, 0x009,
drivers/net/tokenring/tms380tr.c
Diff comments   View file @ de70b4c
... ... @@ -2379,7 +2379,7 @@
2379 2379 EXPORT_SYMBOL(tmsdev_term);
2380 2380 EXPORT_SYMBOL(tms380tr_wait);
2381 2381  
2382   -struct module *TMS380_module = NULL;
  2382 +static struct module *TMS380_module = NULL;
2383 2383  
2384 2384 int init_module(void)
2385 2385 {
... ... @@ -2396,16 +2396,4 @@
2396 2396 #endif
2397 2397  
2398 2398 MODULE_LICENSE("GPL");
2399   -
2400   -
2401   -/*
2402   - * Local variables:
2403   - * compile-command: "gcc -DMODVERSIONS -DMODULE -D__KERNEL__ -Wall -Wstrict-prototypes -O6 -fomit-frame-pointer -I/usr/src/linux/drivers/net/tokenring/ -c tms380tr.c"
2404   - * alt-compile-command: "gcc -DMODULE -D__KERNEL__ -Wall -Wstrict-prototypes -O6 -fomit-frame-pointer -I/usr/src/linux/drivers/net/tokenring/ -c tms380tr.c"
2405   - * c-set-style "K&R"
2406   - * c-indent-level: 8
2407   - * c-basic-offset: 8
2408   - * tab-width: 8
2409   - * End:
2410   - */
drivers/net/tokenring/tmspci.c
Diff comments   View file @ de70b4c
... ... @@ -253,16 +253,4 @@
253 253  
254 254 module_init(tms_pci_init);
255 255 module_exit(tms_pci_rmmod);
256   -
257   -
258   -/*
259   - * Local variables:
260   - * compile-command: "gcc -DMODVERSIONS -DMODULE -D__KERNEL__ -Wall -Wstrict-prototypes -O6 -fomit-frame-pointer -I/usr/src/linux/drivers/net/tokenring/ -c tmspci.c"
261   - * alt-compile-command: "gcc -DMODULE -D__KERNEL__ -Wall -Wstrict-prototypes -O6 -fomit-frame-pointer -I/usr/src/linux/drivers/net/tokenring/ -c tmspci.c"
262   - * c-set-style "K&R"
263   - * c-indent-level: 8
264   - * c-basic-offset: 8
265   - * tab-width: 8
266   - * End:
267   - */