Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 163247c1d274279aa4ac1aa0891858c7a50195c0

Authored by Greg Kroah-Hartman
1 parent 4bf27b8b33
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

Drivers: ssb: remove __dev* attributes. 

CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
markings need to be removed.

This change removes the use of __devinit, and __devexit from these
drivers.

Based on patches originally written by Bill Pemberton, but redone by me
in order to handle some of the coding style issues better, by hand.

Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: Michael Buesch <m@bues.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 4 changed files with 26 additions and 31 deletions Side-by-side Diff

drivers/ssb/driver_gige.c
Diff comments   View file @ 163247c
... ... @@ -107,9 +107,8 @@
107 107 gige_write32(dev, SSB_GIGE_PCICFG + offset, value);
108 108 }
109 109  
110   -static int __devinit ssb_gige_pci_read_config(struct pci_bus *bus,
111   - unsigned int devfn, int reg,
112   - int size, u32 *val)
  110 +static int ssb_gige_pci_read_config(struct pci_bus *bus, unsigned int devfn,
  111 + int reg, int size, u32 *val)
113 112 {
114 113 struct ssb_gige *dev = container_of(bus->ops, struct ssb_gige, pci_ops);
115 114 unsigned long flags;
... ... @@ -138,9 +137,8 @@
138 137 return PCIBIOS_SUCCESSFUL;
139 138 }
140 139  
141   -static int __devinit ssb_gige_pci_write_config(struct pci_bus *bus,
142   - unsigned int devfn, int reg,
143   - int size, u32 val)
  140 +static int ssb_gige_pci_write_config(struct pci_bus *bus, unsigned int devfn,
  141 + int reg, int size, u32 val)
144 142 {
145 143 struct ssb_gige *dev = container_of(bus->ops, struct ssb_gige, pci_ops);
146 144 unsigned long flags;
... ... @@ -169,8 +167,8 @@
169 167 return PCIBIOS_SUCCESSFUL;
170 168 }
171 169  
172   -static int __devinit ssb_gige_probe(struct ssb_device *sdev,
173   - const struct ssb_device_id *id)
  170 +static int ssb_gige_probe(struct ssb_device *sdev,
  171 + const struct ssb_device_id *id)
174 172 {
175 173 struct ssb_gige *dev;
176 174 u32 base, tmslow, tmshigh;
drivers/ssb/driver_pcicore.c
Diff comments   View file @ 163247c
... ... @@ -315,7 +315,7 @@
315 315 return ssb_mips_irq(extpci_core->dev) + 2;
316 316 }
317 317  
318   -static void __devinit ssb_pcicore_init_hostmode(struct ssb_pcicore *pc)
  318 +static void ssb_pcicore_init_hostmode(struct ssb_pcicore *pc)
319 319 {
320 320 u32 val;
321 321  
... ... @@ -380,7 +380,7 @@
380 380 register_pci_controller(&ssb_pcicore_controller);
381 381 }
382 382  
383   -static int __devinit pcicore_is_in_hostmode(struct ssb_pcicore *pc)
  383 +static int pcicore_is_in_hostmode(struct ssb_pcicore *pc)
384 384 {
385 385 struct ssb_bus *bus = pc->dev->bus;
386 386 u16 chipid_top;
... ... @@ -413,7 +413,7 @@
413 413 * Workarounds.
414 414 **************************************************/
415 415  
416   -static void __devinit ssb_pcicore_fix_sprom_core_index(struct ssb_pcicore *pc)
  416 +static void ssb_pcicore_fix_sprom_core_index(struct ssb_pcicore *pc)
417 417 {
418 418 u16 tmp = pcicore_read16(pc, SSB_PCICORE_SPROM(0));
419 419 if (((tmp & 0xF000) >> 12) != pc->dev->core_index) {
... ... @@ -515,7 +515,7 @@
515 515 * Generic and Clientmode operation code.
516 516 **************************************************/
517 517  
518   -static void __devinit ssb_pcicore_init_clientmode(struct ssb_pcicore *pc)
  518 +static void ssb_pcicore_init_clientmode(struct ssb_pcicore *pc)
519 519 {
520 520 struct ssb_device *pdev = pc->dev;
521 521 struct ssb_bus *bus = pdev->bus;
... ... @@ -534,7 +534,7 @@
534 534 }
535 535 }
536 536  
537   -void __devinit ssb_pcicore_init(struct ssb_pcicore *pc)
  537 +void ssb_pcicore_init(struct ssb_pcicore *pc)
538 538 {
539 539 struct ssb_device *dev = pc->dev;
540 540  
... ... @@ -548,7 +548,7 @@
548 548 }
549 549  
550 550 /* Needs ssb_buses_lock() */
551   -static int __devinit ssb_attach_queued_buses(void)
  551 +static int ssb_attach_queued_buses(void)
552 552 {
553 553 struct ssb_bus *bus, *n;
554 554 int err = 0;
... ... @@ -761,9 +761,9 @@
761 761 return err;
762 762 }
763 763  
764   -static int __devinit ssb_bus_register(struct ssb_bus *bus,
765   - ssb_invariants_func_t get_invariants,
766   - unsigned long baseaddr)
  764 +static int ssb_bus_register(struct ssb_bus *bus,
  765 + ssb_invariants_func_t get_invariants,
  766 + unsigned long baseaddr)
767 767 {
768 768 int err;
769 769  
... ... @@ -851,8 +851,7 @@
851 851 }
852 852  
853 853 #ifdef CONFIG_SSB_PCIHOST
854   -int __devinit ssb_bus_pcibus_register(struct ssb_bus *bus,
855   - struct pci_dev *host_pci)
  854 +int ssb_bus_pcibus_register(struct ssb_bus *bus, struct pci_dev *host_pci)
856 855 {
857 856 int err;
858 857  
... ... @@ -875,9 +874,9 @@
875 874 #endif /* CONFIG_SSB_PCIHOST */
876 875  
877 876 #ifdef CONFIG_SSB_PCMCIAHOST
878   -int __devinit ssb_bus_pcmciabus_register(struct ssb_bus *bus,
879   - struct pcmcia_device *pcmcia_dev,
880   - unsigned long baseaddr)
  877 +int ssb_bus_pcmciabus_register(struct ssb_bus *bus,
  878 + struct pcmcia_device *pcmcia_dev,
  879 + unsigned long baseaddr)
881 880 {
882 881 int err;
883 882  
... ... @@ -897,9 +896,8 @@
897 896 #endif /* CONFIG_SSB_PCMCIAHOST */
898 897  
899 898 #ifdef CONFIG_SSB_SDIOHOST
900   -int __devinit ssb_bus_sdiobus_register(struct ssb_bus *bus,
901   - struct sdio_func *func,
902   - unsigned int quirks)
  899 +int ssb_bus_sdiobus_register(struct ssb_bus *bus, struct sdio_func *func,
  900 + unsigned int quirks)
903 901 {
904 902 int err;
905 903  
... ... @@ -919,9 +917,8 @@
919 917 EXPORT_SYMBOL(ssb_bus_sdiobus_register);
920 918 #endif /* CONFIG_SSB_PCMCIAHOST */
921 919  
922   -int __devinit ssb_bus_ssbbus_register(struct ssb_bus *bus,
923   - unsigned long baseaddr,
924   - ssb_invariants_func_t get_invariants)
  920 +int ssb_bus_ssbbus_register(struct ssb_bus *bus, unsigned long baseaddr,
  921 + ssb_invariants_func_t get_invariants)
925 922 {
926 923 int err;
927 924  
drivers/ssb/pcihost_wrapper.c
Diff comments   View file @ 163247c
... ... @@ -54,8 +54,8 @@
54 54 # define ssb_pcihost_resume NULL
55 55 #endif /* CONFIG_PM */
56 56  
57   -static int __devinit ssb_pcihost_probe(struct pci_dev *dev,
58   - const struct pci_device_id *id)
  57 +static int ssb_pcihost_probe(struct pci_dev *dev,
  58 + const struct pci_device_id *id)
59 59 {
60 60 struct ssb_bus *ssb;
61 61 int err = -ENOMEM;
... ... @@ -111,7 +111,7 @@
111 111 pci_set_drvdata(dev, NULL);
112 112 }
113 113  
114   -int __devinit ssb_pcihost_register(struct pci_driver *driver)
  114 +int ssb_pcihost_register(struct pci_driver *driver)
115 115 {
116 116 driver->probe = ssb_pcihost_probe;
117 117 driver->remove = ssb_pcihost_remove;