Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ALPHA: drivers: 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, __devexit_p, __devinitdata,
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: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

+11 -13
+2 -2
arch/alpha/include/asm/parport.h
··· 9 9 #ifndef _ASM_AXP_PARPORT_H 10 10 #define _ASM_AXP_PARPORT_H 1 11 11 12 - static int __devinit parport_pc_find_isa_ports (int autoirq, int autodma); 13 - static int __devinit parport_pc_find_nonpci_ports (int autoirq, int autodma) 12 + static int parport_pc_find_isa_ports (int autoirq, int autodma); 13 + static int parport_pc_find_nonpci_ports (int autoirq, int autodma) 14 14 { 15 15 return parport_pc_find_isa_ports (autoirq, autodma); 16 16 }
+5 -7
arch/alpha/kernel/pci.c
··· 59 59 * Quirks. 60 60 */ 61 61 62 - static void __devinit quirk_isa_bridge(struct pci_dev *dev) 62 + static void quirk_isa_bridge(struct pci_dev *dev) 63 63 { 64 64 dev->class = PCI_CLASS_BRIDGE_ISA << 8; 65 65 } 66 66 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82378, quirk_isa_bridge); 67 67 68 - static void __devinit quirk_cypress(struct pci_dev *dev) 68 + static void quirk_cypress(struct pci_dev *dev) 69 69 { 70 70 /* The Notorious Cy82C693 chip. */ 71 71 ··· 104 104 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_CONTAQ, PCI_DEVICE_ID_CONTAQ_82C693, quirk_cypress); 105 105 106 106 /* Called for each device after PCI setup is done. */ 107 - static void __devinit pcibios_fixup_final(struct pci_dev *dev) 107 + static void pcibios_fixup_final(struct pci_dev *dev) 108 108 { 109 109 unsigned int class = dev->class >> 8; 110 110 ··· 198 198 #ifdef ALPHA_RESTORE_SRM_SETUP 199 199 static struct pdev_srm_saved_conf *srm_saved_configs; 200 200 201 - void __devinit 202 - pdev_save_srm_config(struct pci_dev *dev) 201 + void pdev_save_srm_config(struct pci_dev *dev) 203 202 { 204 203 struct pdev_srm_saved_conf *tmp; 205 204 static int printed = 0; ··· 240 241 } 241 242 #endif 242 243 243 - void __devinit 244 - pcibios_fixup_bus(struct pci_bus *bus) 244 + void pcibios_fixup_bus(struct pci_bus *bus) 245 245 { 246 246 struct pci_dev *dev = bus->self; 247 247
+3 -3
arch/alpha/kernel/smp.c
··· 68 68 }; 69 69 70 70 /* Set to a secondary's cpuid when it comes online. */ 71 - static int smp_secondary_alive __devinitdata = 0; 71 + static int smp_secondary_alive = 0; 72 72 73 73 int smp_num_probed; /* Internal processor count */ 74 74 int smp_num_cpus = 1; /* Number that came online. */ ··· 172 172 } 173 173 174 174 /* Wait until hwrpb->txrdy is clear for cpu. Return -1 on timeout. */ 175 - static int __devinit 175 + static int 176 176 wait_for_txrdy (unsigned long cpumask) 177 177 { 178 178 unsigned long timeout; ··· 468 468 smp_num_cpus = smp_num_probed; 469 469 } 470 470 471 - void __devinit 471 + void 472 472 smp_prepare_boot_cpu(void) 473 473 { 474 474 }
+1 -1
arch/alpha/kernel/sys_titan.c
··· 303 303 304 304 } 305 305 306 - static int __devinit 306 + static int 307 307 titan_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) 308 308 { 309 309 u8 intline;