diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-21 16:21:03 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-03 18:57:03 -0500 |
commit | fe31edc8a3b6081f3580c9ae4c5c61103f3412a5 (patch) | |
tree | 84b9d3b008f33031093a73a7bec7f422f3a7eff8 /drivers/ide/pmac.c | |
parent | 0ec24914675c48213378da550db494bf154f0f6c (diff) |
Drivers: ide: 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,
__devinitconst, 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: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/ide/pmac.c')
-rw-r--r-- | drivers/ide/pmac.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/ide/pmac.c b/drivers/ide/pmac.c index e944c7f705f..bf83d7bb6bc 100644 --- a/drivers/ide/pmac.c +++ b/drivers/ide/pmac.c | |||
@@ -1025,8 +1025,7 @@ static const struct ide_port_info pmac_port_info = { | |||
1025 | * Setup, register & probe an IDE channel driven by this driver, this is | 1025 | * Setup, register & probe an IDE channel driven by this driver, this is |
1026 | * called by one of the 2 probe functions (macio or PCI). | 1026 | * called by one of the 2 probe functions (macio or PCI). |
1027 | */ | 1027 | */ |
1028 | static int __devinit pmac_ide_setup_device(pmac_ide_hwif_t *pmif, | 1028 | static int pmac_ide_setup_device(pmac_ide_hwif_t *pmif, struct ide_hw *hw) |
1029 | struct ide_hw *hw) | ||
1030 | { | 1029 | { |
1031 | struct device_node *np = pmif->node; | 1030 | struct device_node *np = pmif->node; |
1032 | const int *bidp; | 1031 | const int *bidp; |
@@ -1126,7 +1125,7 @@ static int __devinit pmac_ide_setup_device(pmac_ide_hwif_t *pmif, | |||
1126 | return rc; | 1125 | return rc; |
1127 | } | 1126 | } |
1128 | 1127 | ||
1129 | static void __devinit pmac_ide_init_ports(struct ide_hw *hw, unsigned long base) | 1128 | static void pmac_ide_init_ports(struct ide_hw *hw, unsigned long base) |
1130 | { | 1129 | { |
1131 | int i; | 1130 | int i; |
1132 | 1131 | ||
@@ -1139,8 +1138,8 @@ static void __devinit pmac_ide_init_ports(struct ide_hw *hw, unsigned long base) | |||
1139 | /* | 1138 | /* |
1140 | * Attach to a macio probed interface | 1139 | * Attach to a macio probed interface |
1141 | */ | 1140 | */ |
1142 | static int __devinit | 1141 | static int pmac_ide_macio_attach(struct macio_dev *mdev, |
1143 | pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_device_id *match) | 1142 | const struct of_device_id *match) |
1144 | { | 1143 | { |
1145 | void __iomem *base; | 1144 | void __iomem *base; |
1146 | unsigned long regbase; | 1145 | unsigned long regbase; |
@@ -1262,8 +1261,8 @@ pmac_ide_macio_resume(struct macio_dev *mdev) | |||
1262 | /* | 1261 | /* |
1263 | * Attach to a PCI probed interface | 1262 | * Attach to a PCI probed interface |
1264 | */ | 1263 | */ |
1265 | static int __devinit | 1264 | static int pmac_ide_pci_attach(struct pci_dev *pdev, |
1266 | pmac_ide_pci_attach(struct pci_dev *pdev, const struct pci_device_id *id) | 1265 | const struct pci_device_id *id) |
1267 | { | 1266 | { |
1268 | struct device_node *np; | 1267 | struct device_node *np; |
1269 | pmac_ide_hwif_t *pmif; | 1268 | pmac_ide_hwif_t *pmif; |
@@ -1692,8 +1691,7 @@ static const struct ide_dma_ops pmac_dma_ops = { | |||
1692 | * Allocate the data structures needed for using DMA with an interface | 1691 | * Allocate the data structures needed for using DMA with an interface |
1693 | * and fill the proper list of functions pointers | 1692 | * and fill the proper list of functions pointers |
1694 | */ | 1693 | */ |
1695 | static int __devinit pmac_ide_init_dma(ide_hwif_t *hwif, | 1694 | static int pmac_ide_init_dma(ide_hwif_t *hwif, const struct ide_port_info *d) |
1696 | const struct ide_port_info *d) | ||
1697 | { | 1695 | { |
1698 | pmac_ide_hwif_t *pmif = | 1696 | pmac_ide_hwif_t *pmif = |
1699 | (pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent); | 1697 | (pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent); |