aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/xen
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-12-21 16:00:00 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-03 18:57:01 -0500
commit345a52558ecd7e7c4cbbce58f3f9f3588dd1015c (patch)
treeeb22028aa4e5edbd3ec5c11eaee3aa3e29e3ab47 /drivers/xen
parent10532fe7623dd63ef915be272247ec13f79afbb8 (diff)
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>
Diffstat (limited to 'drivers/xen')
-rw-r--r--drivers/xen/grant-table.c2
-rw-r--r--drivers/xen/platform-pci.c6
-rw-r--r--drivers/xen/xen-pciback/pci_stub.c13
3 files changed, 10 insertions, 11 deletions
diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c
index b91f14e83164..7038de53652b 100644
--- a/drivers/xen/grant-table.c
+++ b/drivers/xen/grant-table.c
@@ -1239,7 +1239,7 @@ int gnttab_init(void)
1239} 1239}
1240EXPORT_SYMBOL_GPL(gnttab_init); 1240EXPORT_SYMBOL_GPL(gnttab_init);
1241 1241
1242static int __devinit __gnttab_init(void) 1242static int __gnttab_init(void)
1243{ 1243{
1244 /* Delay grant-table initialization in the PV on HVM case */ 1244 /* Delay grant-table initialization in the PV on HVM case */
1245 if (xen_hvm_domain()) 1245 if (xen_hvm_domain())
diff --git a/drivers/xen/platform-pci.c b/drivers/xen/platform-pci.c
index 97ca359ae2bd..99db9e1eb8ba 100644
--- a/drivers/xen/platform-pci.c
+++ b/drivers/xen/platform-pci.c
@@ -101,8 +101,8 @@ static int platform_pci_resume(struct pci_dev *pdev)
101 return 0; 101 return 0;
102} 102}
103 103
104static int __devinit platform_pci_init(struct pci_dev *pdev, 104static int platform_pci_init(struct pci_dev *pdev,
105 const struct pci_device_id *ent) 105 const struct pci_device_id *ent)
106{ 106{
107 int i, ret; 107 int i, ret;
108 long ioaddr; 108 long ioaddr;
@@ -170,7 +170,7 @@ pci_out:
170 return ret; 170 return ret;
171} 171}
172 172
173static struct pci_device_id platform_pci_tbl[] __devinitdata = { 173static struct pci_device_id platform_pci_tbl[] = {
174 {PCI_VENDOR_ID_XEN, PCI_DEVICE_ID_XEN_PLATFORM, 174 {PCI_VENDOR_ID_XEN, PCI_DEVICE_ID_XEN_PLATFORM,
175 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, 175 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
176 {0,} 176 {0,}
diff --git a/drivers/xen/xen-pciback/pci_stub.c b/drivers/xen/xen-pciback/pci_stub.c
index cd50d251998e..9204126f1560 100644
--- a/drivers/xen/xen-pciback/pci_stub.c
+++ b/drivers/xen/xen-pciback/pci_stub.c
@@ -272,8 +272,8 @@ void pcistub_put_pci_dev(struct pci_dev *dev)
272 up_write(&pcistub_sem); 272 up_write(&pcistub_sem);
273} 273}
274 274
275static int __devinit pcistub_match_one(struct pci_dev *dev, 275static int pcistub_match_one(struct pci_dev *dev,
276 struct pcistub_device_id *pdev_id) 276 struct pcistub_device_id *pdev_id)
277{ 277{
278 /* Match the specified device by domain, bus, slot, func and also if 278 /* Match the specified device by domain, bus, slot, func and also if
279 * any of the device's parent bridges match. 279 * any of the device's parent bridges match.
@@ -292,7 +292,7 @@ static int __devinit pcistub_match_one(struct pci_dev *dev,
292 return 0; 292 return 0;
293} 293}
294 294
295static int __devinit pcistub_match(struct pci_dev *dev) 295static int pcistub_match(struct pci_dev *dev)
296{ 296{
297 struct pcistub_device_id *pdev_id; 297 struct pcistub_device_id *pdev_id;
298 unsigned long flags; 298 unsigned long flags;
@@ -310,7 +310,7 @@ static int __devinit pcistub_match(struct pci_dev *dev)
310 return found; 310 return found;
311} 311}
312 312
313static int __devinit pcistub_init_device(struct pci_dev *dev) 313static int pcistub_init_device(struct pci_dev *dev)
314{ 314{
315 struct xen_pcibk_dev_data *dev_data; 315 struct xen_pcibk_dev_data *dev_data;
316 int err = 0; 316 int err = 0;
@@ -428,7 +428,7 @@ static int __init pcistub_init_devices_late(void)
428 return 0; 428 return 0;
429} 429}
430 430
431static int __devinit pcistub_seize(struct pci_dev *dev) 431static int pcistub_seize(struct pci_dev *dev)
432{ 432{
433 struct pcistub_device *psdev; 433 struct pcistub_device *psdev;
434 unsigned long flags; 434 unsigned long flags;
@@ -463,8 +463,7 @@ static int __devinit pcistub_seize(struct pci_dev *dev)
463 return err; 463 return err;
464} 464}
465 465
466static int __devinit pcistub_probe(struct pci_dev *dev, 466static int pcistub_probe(struct pci_dev *dev, const struct pci_device_id *id)
467 const struct pci_device_id *id)
468{ 467{
469 int err = 0; 468 int err = 0;
470 469