diff options
| author |   Bill Pemberton <wfp5p@virginia.edu> | 2012-11-19 13:23:05 -0500 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-21 12:51:53 -0800 |
| commit | 80c8ae289266529445fad030fabf5fcf01ccda0d (patch) | |
| tree | eba9aed6018d314a492eea1e00f03e5de83a2665 /drivers/misc/cb710 | |
| parent | drivers/misc: remove use of __devexit_p (diff) | |
| download | linux-dev-80c8ae289266529445fad030fabf5fcf01ccda0d.tar.xz linux-dev-80c8ae289266529445fad030fabf5fcf01ccda0d.zip | |
misc: remove use of __devinit
CONFIG_HOTPLUG is going away as an option so __devinit is no longer
needed.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: "Michał Mirosław" <mirq-linux@rere.qmqm.pl>
Cc: Eric Piel <eric.piel@tremplin-utc.net>
Cc: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/cb710')
| -rw-r--r-- | drivers/misc/cb710/core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/misc/cb710/core.c b/drivers/misc/cb710/core.c index 489c468cf965..4fc9c37cd202 100644 --- a/drivers/misc/cb710/core.c +++ b/drivers/misc/cb710/core.c @@ -30,7 +30,7 @@ void cb710_pci_update_config_reg(struct pci_dev *pdev, EXPORT_SYMBOL_GPL(cb710_pci_update_config_reg); /* Some magic writes based on Windows driver init code */ -static int __devinit cb710_pci_configure(struct pci_dev *pdev) +static int cb710_pci_configure(struct pci_dev *pdev) { unsigned int devfn = PCI_DEVFN(PCI_SLOT(pdev->devfn), 0); struct pci_dev *pdev0; @@ -96,7 +96,7 @@ static void cb710_release_slot(struct device *dev) #endif } -static int __devinit cb710_register_slot(struct cb710_chip *chip, +static int cb710_register_slot(struct cb710_chip *chip, unsigned slot_mask, unsigned io_offset, const char *name) { int nr = chip->slots; @@ -201,7 +201,7 @@ static int cb710_resume(struct pci_dev *pdev) #endif /* CONFIG_PM */ -static int __devinit cb710_probe(struct pci_dev *pdev, +static int cb710_probe(struct pci_dev *pdev, const struct pci_device_id *ent) { struct cb710_chip *chip; |