lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Drivers: xen: remove __dev* attributes.

Browse Source 
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>
This commit is contained in:
Greg Kroah-Hartman
2012-12-21 13:00:00 -08:00
parent 10532fe762
commit 345a52558e
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/xen/grant-table.c
View File

@@ -1239,7 +1239,7 @@ int gnttab_init(void)
} }
EXPORT_SYMBOL_GPL(gnttab_init); EXPORT_SYMBOL_GPL(gnttab_init);
static int __devinit __gnttab_init(void) static int __gnttab_init(void)
{ {
/* Delay grant-table initialization in the PV on HVM case */ /* Delay grant-table initialization in the PV on HVM case */
if (xen_hvm_domain()) if (xen_hvm_domain())

4
drivers/xen/platform-pci.c
View File

@@ -101,7 +101,7 @@ static int platform_pci_resume(struct pci_dev *pdev)
return 0; return 0;
} }
static int __devinit platform_pci_init(struct pci_dev *pdev, static int platform_pci_init(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
int i, ret; int i, ret;
@@ -170,7 +170,7 @@ pci_out:
return ret; return ret;
} }
static struct pci_device_id platform_pci_tbl[] __devinitdata = { static struct pci_device_id platform_pci_tbl[] = {
{PCI_VENDOR_ID_XEN, PCI_DEVICE_ID_XEN_PLATFORM, {PCI_VENDOR_ID_XEN, PCI_DEVICE_ID_XEN_PLATFORM,
PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{0,} {0,}

11
drivers/xen/xen-pciback/pci_stub.c
View File

@@ -272,7 +272,7 @@ void pcistub_put_pci_dev(struct pci_dev *dev)
up_write(&pcistub_sem); up_write(&pcistub_sem);
} }
static int __devinit pcistub_match_one(struct pci_dev *dev, static int pcistub_match_one(struct pci_dev *dev,
struct pcistub_device_id *pdev_id) struct pcistub_device_id *pdev_id)
{ {
/* Match the specified device by domain, bus, slot, func and also if /* Match the specified device by domain, bus, slot, func and also if
@@ -292,7 +292,7 @@ static int __devinit pcistub_match_one(struct pci_dev *dev,
return 0; return 0;
} }
static int __devinit pcistub_match(struct pci_dev *dev) static int pcistub_match(struct pci_dev *dev)
{ {
struct pcistub_device_id *pdev_id; struct pcistub_device_id *pdev_id;
unsigned long flags; unsigned long flags;
@@ -310,7 +310,7 @@ static int __devinit pcistub_match(struct pci_dev *dev)
return found; return found;
} }
static int __devinit pcistub_init_device(struct pci_dev *dev) static int pcistub_init_device(struct pci_dev *dev)
{ {
struct xen_pcibk_dev_data *dev_data; struct xen_pcibk_dev_data *dev_data;
int err = 0; int err = 0;
@@ -428,7 +428,7 @@ static int __init pcistub_init_devices_late(void)
return 0; return 0;
} }
static int __devinit pcistub_seize(struct pci_dev *dev) static int pcistub_seize(struct pci_dev *dev)
{ {
struct pcistub_device *psdev; struct pcistub_device *psdev;
unsigned long flags; unsigned long flags;
@@ -463,8 +463,7 @@ static int __devinit pcistub_seize(struct pci_dev *dev)
return err; return err;
} }
static int __devinit pcistub_probe(struct pci_dev *dev, static int pcistub_probe(struct pci_dev *dev, const struct pci_device_id *id)
const struct pci_device_id *id)
{ {
int err = 0; int err = 0;