diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-21 16:13:05 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-03 18:57:02 -0500 |
commit | ed5a84cdf593e54969518e82762786fbe1284ce4 (patch) | |
tree | 12e363d3198a6b6c8ab039eb82f1a7d31aac42b6 /drivers/isdn/hisax/hfc4s8s_l1.c | |
parent | 150632b09aadf1996f5cb6c0c2620d63a01fe2de (diff) |
Drivers: isdn: 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: Karsten Keil <isdn@linux-pingi.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/isdn/hisax/hfc4s8s_l1.c')
-rw-r--r-- | drivers/isdn/hisax/hfc4s8s_l1.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/drivers/isdn/hisax/hfc4s8s_l1.c b/drivers/isdn/hisax/hfc4s8s_l1.c index dea04de8e7ca..c49c294fc81e 100644 --- a/drivers/isdn/hisax/hfc4s8s_l1.c +++ b/drivers/isdn/hisax/hfc4s8s_l1.c | |||
@@ -1497,7 +1497,7 @@ enable_pci_ports(hfc4s8s_hw *hw) | |||
1497 | /* initialise the HFC-4s/8s hardware */ | 1497 | /* initialise the HFC-4s/8s hardware */ |
1498 | /* return 0 on success. */ | 1498 | /* return 0 on success. */ |
1499 | /*************************************/ | 1499 | /*************************************/ |
1500 | static int __devinit | 1500 | static int |
1501 | setup_instance(hfc4s8s_hw *hw) | 1501 | setup_instance(hfc4s8s_hw *hw) |
1502 | { | 1502 | { |
1503 | int err = -EIO; | 1503 | int err = -EIO; |
@@ -1585,7 +1585,7 @@ out: | |||
1585 | /*****************************************/ | 1585 | /*****************************************/ |
1586 | /* PCI hotplug interface: probe new card */ | 1586 | /* PCI hotplug interface: probe new card */ |
1587 | /*****************************************/ | 1587 | /*****************************************/ |
1588 | static int __devinit | 1588 | static int |
1589 | hfc4s8s_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | 1589 | hfc4s8s_probe(struct pci_dev *pdev, const struct pci_device_id *ent) |
1590 | { | 1590 | { |
1591 | int err = -ENOMEM; | 1591 | int err = -ENOMEM; |
@@ -1640,7 +1640,7 @@ out: | |||
1640 | /**************************************/ | 1640 | /**************************************/ |
1641 | /* PCI hotplug interface: remove card */ | 1641 | /* PCI hotplug interface: remove card */ |
1642 | /**************************************/ | 1642 | /**************************************/ |
1643 | static void __devexit | 1643 | static void |
1644 | hfc4s8s_remove(struct pci_dev *pdev) | 1644 | hfc4s8s_remove(struct pci_dev *pdev) |
1645 | { | 1645 | { |
1646 | hfc4s8s_hw *hw = pci_get_drvdata(pdev); | 1646 | hfc4s8s_hw *hw = pci_get_drvdata(pdev); |
@@ -1662,7 +1662,7 @@ hfc4s8s_remove(struct pci_dev *pdev) | |||
1662 | static struct pci_driver hfc4s8s_driver = { | 1662 | static struct pci_driver hfc4s8s_driver = { |
1663 | .name = "hfc4s8s_l1", | 1663 | .name = "hfc4s8s_l1", |
1664 | .probe = hfc4s8s_probe, | 1664 | .probe = hfc4s8s_probe, |
1665 | .remove = __devexit_p(hfc4s8s_remove), | 1665 | .remove = hfc4s8s_remove, |
1666 | .id_table = hfc4s8s_ids, | 1666 | .id_table = hfc4s8s_ids, |
1667 | }; | 1667 | }; |
1668 | 1668 | ||
@@ -1688,14 +1688,6 @@ hfc4s8s_module_init(void) | |||
1688 | } | 1688 | } |
1689 | printk(KERN_INFO "HFC-4S/8S: found %d cards\n", card_cnt); | 1689 | printk(KERN_INFO "HFC-4S/8S: found %d cards\n", card_cnt); |
1690 | 1690 | ||
1691 | #if !defined(CONFIG_HOTPLUG) | ||
1692 | if (err == 0) { | ||
1693 | err = -ENODEV; | ||
1694 | pci_unregister_driver(&hfc4s8s_driver); | ||
1695 | goto out; | ||
1696 | } | ||
1697 | #endif | ||
1698 | |||
1699 | return 0; | 1691 | return 0; |
1700 | out: | 1692 | out: |
1701 | return (err); | 1693 | return (err); |