diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-08-05 12:17:04 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-08-05 12:17:04 -0400 |
commit | f454cbe8cd38b6d447e74ddaf012017fea42717e (patch) | |
tree | 12b53fb8f50a0197411d39c570ac525bf6c616ad /drivers/ide/pci/serverworks.c | |
parent | 36de994809264f752e51b74e77a9c49091d14230 (diff) |
ide: ->cable_detect method cannot be marked __devinit
Now that we have warm-plug support ->cable_detect method no longer
can be be marked __devinit.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/pci/serverworks.c')
-rw-r--r-- | drivers/ide/pci/serverworks.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c index d173f2937722..c3bdc6e51a48 100644 --- a/drivers/ide/pci/serverworks.c +++ b/drivers/ide/pci/serverworks.c | |||
@@ -272,7 +272,7 @@ static unsigned int __devinit init_chipset_svwks(struct pci_dev *dev) | |||
272 | return dev->irq; | 272 | return dev->irq; |
273 | } | 273 | } |
274 | 274 | ||
275 | static u8 __devinit ata66_svwks_svwks(ide_hwif_t *hwif) | 275 | static u8 ata66_svwks_svwks(ide_hwif_t *hwif) |
276 | { | 276 | { |
277 | return ATA_CBL_PATA80; | 277 | return ATA_CBL_PATA80; |
278 | } | 278 | } |
@@ -284,7 +284,7 @@ static u8 __devinit ata66_svwks_svwks(ide_hwif_t *hwif) | |||
284 | * Bit 14 clear = primary IDE channel does not have 80-pin cable. | 284 | * Bit 14 clear = primary IDE channel does not have 80-pin cable. |
285 | * Bit 14 set = primary IDE channel has 80-pin cable. | 285 | * Bit 14 set = primary IDE channel has 80-pin cable. |
286 | */ | 286 | */ |
287 | static u8 __devinit ata66_svwks_dell(ide_hwif_t *hwif) | 287 | static u8 ata66_svwks_dell(ide_hwif_t *hwif) |
288 | { | 288 | { |
289 | struct pci_dev *dev = to_pci_dev(hwif->dev); | 289 | struct pci_dev *dev = to_pci_dev(hwif->dev); |
290 | 290 | ||
@@ -303,7 +303,7 @@ static u8 __devinit ata66_svwks_dell(ide_hwif_t *hwif) | |||
303 | * | 303 | * |
304 | * WARNING: this only works on Alpine hardware! | 304 | * WARNING: this only works on Alpine hardware! |
305 | */ | 305 | */ |
306 | static u8 __devinit ata66_svwks_cobalt(ide_hwif_t *hwif) | 306 | static u8 ata66_svwks_cobalt(ide_hwif_t *hwif) |
307 | { | 307 | { |
308 | struct pci_dev *dev = to_pci_dev(hwif->dev); | 308 | struct pci_dev *dev = to_pci_dev(hwif->dev); |
309 | 309 | ||
@@ -315,7 +315,7 @@ static u8 __devinit ata66_svwks_cobalt(ide_hwif_t *hwif) | |||
315 | return ATA_CBL_PATA40; | 315 | return ATA_CBL_PATA40; |
316 | } | 316 | } |
317 | 317 | ||
318 | static u8 __devinit svwks_cable_detect(ide_hwif_t *hwif) | 318 | static u8 svwks_cable_detect(ide_hwif_t *hwif) |
319 | { | 319 | { |
320 | struct pci_dev *dev = to_pci_dev(hwif->dev); | 320 | struct pci_dev *dev = to_pci_dev(hwif->dev); |
321 | 321 | ||