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

Drivers: xen: 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 __devinitdata 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: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Jan Beulich <jbeulich@suse.com>
Cc: Stephen Hemminger <shemminger@vyatta.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

+10 -11
+1 -1
drivers/xen/grant-table.c
··· 1239 1239 } 1240 1240 EXPORT_SYMBOL_GPL(gnttab_init); 1241 1241 1242 - static int __devinit __gnttab_init(void) 1242 + static int __gnttab_init(void) 1243 1243 { 1244 1244 /* Delay grant-table initialization in the PV on HVM case */ 1245 1245 if (xen_hvm_domain())
+3 -3
drivers/xen/platform-pci.c
··· 101 101 return 0; 102 102 } 103 103 104 - static int __devinit platform_pci_init(struct pci_dev *pdev, 105 - const struct pci_device_id *ent) 104 + static int platform_pci_init(struct pci_dev *pdev, 105 + const struct pci_device_id *ent) 106 106 { 107 107 int i, ret; 108 108 long ioaddr; ··· 170 170 return ret; 171 171 } 172 172 173 - static struct pci_device_id platform_pci_tbl[] __devinitdata = { 173 + static struct pci_device_id platform_pci_tbl[] = { 174 174 {PCI_VENDOR_ID_XEN, PCI_DEVICE_ID_XEN_PLATFORM, 175 175 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, 176 176 {0,}
+6 -7
drivers/xen/xen-pciback/pci_stub.c
··· 272 272 up_write(&pcistub_sem); 273 273 } 274 274 275 - static int __devinit pcistub_match_one(struct pci_dev *dev, 276 - struct pcistub_device_id *pdev_id) 275 + static int pcistub_match_one(struct pci_dev *dev, 276 + struct pcistub_device_id *pdev_id) 277 277 { 278 278 /* Match the specified device by domain, bus, slot, func and also if 279 279 * any of the device's parent bridges match. ··· 292 292 return 0; 293 293 } 294 294 295 - static int __devinit pcistub_match(struct pci_dev *dev) 295 + static int pcistub_match(struct pci_dev *dev) 296 296 { 297 297 struct pcistub_device_id *pdev_id; 298 298 unsigned long flags; ··· 310 310 return found; 311 311 } 312 312 313 - static int __devinit pcistub_init_device(struct pci_dev *dev) 313 + static int pcistub_init_device(struct pci_dev *dev) 314 314 { 315 315 struct xen_pcibk_dev_data *dev_data; 316 316 int err = 0; ··· 428 428 return 0; 429 429 } 430 430 431 - static int __devinit pcistub_seize(struct pci_dev *dev) 431 + static int pcistub_seize(struct pci_dev *dev) 432 432 { 433 433 struct pcistub_device *psdev; 434 434 unsigned long flags; ··· 463 463 return err; 464 464 } 465 465 466 - static int __devinit pcistub_probe(struct pci_dev *dev, 467 - const struct pci_device_id *id) 466 + static int pcistub_probe(struct pci_dev *dev, const struct pci_device_id *id) 468 467 { 469 468 int err = 0; 470 469