diff options
author | Alan Cox <alan@redhat.com> | 2007-03-09 09:34:07 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-04-28 14:15:58 -0400 |
commit | a76b62ca70662cd0ca98edf366c6637009a95f7d (patch) | |
tree | 1f93b3bec4a77ed3146a1d9de29140c525b35479 /drivers/ata/pata_hpt37x.c | |
parent | 9d2c7c75f889a3eefad016c71f651b0796e0a6e9 (diff) |
libata: Change prototype of mode_filter to remove ata_port*
With Tejun having added adev->ap some time ago we can get rid of the
almost unused port being passed to mode filters. And while we are
doing filters, lets turn on the !IORDY filter as well.
Signed-off-by: Alan Cox <alan@redhat.com>
With some hand massaging from
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/pata_hpt37x.c')
-rw-r--r-- | drivers/ata/pata_hpt37x.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/ata/pata_hpt37x.c b/drivers/ata/pata_hpt37x.c index 12f387f37771..fe1b482d5291 100644 --- a/drivers/ata/pata_hpt37x.c +++ b/drivers/ata/pata_hpt37x.c | |||
@@ -272,13 +272,12 @@ static const char *bad_ata100_5[] = { | |||
272 | 272 | ||
273 | /** | 273 | /** |
274 | * hpt370_filter - mode selection filter | 274 | * hpt370_filter - mode selection filter |
275 | * @ap: ATA interface | ||
276 | * @adev: ATA device | 275 | * @adev: ATA device |
277 | * | 276 | * |
278 | * Block UDMA on devices that cause trouble with this controller. | 277 | * Block UDMA on devices that cause trouble with this controller. |
279 | */ | 278 | */ |
280 | 279 | ||
281 | static unsigned long hpt370_filter(const struct ata_port *ap, struct ata_device *adev, unsigned long mask) | 280 | static unsigned long hpt370_filter(struct ata_device *adev, unsigned long mask) |
282 | { | 281 | { |
283 | if (adev->class == ATA_DEV_ATA) { | 282 | if (adev->class == ATA_DEV_ATA) { |
284 | if (hpt_dma_blacklisted(adev, "UDMA", bad_ata33)) | 283 | if (hpt_dma_blacklisted(adev, "UDMA", bad_ata33)) |
@@ -286,24 +285,23 @@ static unsigned long hpt370_filter(const struct ata_port *ap, struct ata_device | |||
286 | if (hpt_dma_blacklisted(adev, "UDMA100", bad_ata100_5)) | 285 | if (hpt_dma_blacklisted(adev, "UDMA100", bad_ata100_5)) |
287 | mask &= ~(0x1F << ATA_SHIFT_UDMA); | 286 | mask &= ~(0x1F << ATA_SHIFT_UDMA); |
288 | } | 287 | } |
289 | return ata_pci_default_filter(ap, adev, mask); | 288 | return ata_pci_default_filter(adev, mask); |
290 | } | 289 | } |
291 | 290 | ||
292 | /** | 291 | /** |
293 | * hpt370a_filter - mode selection filter | 292 | * hpt370a_filter - mode selection filter |
294 | * @ap: ATA interface | ||
295 | * @adev: ATA device | 293 | * @adev: ATA device |
296 | * | 294 | * |
297 | * Block UDMA on devices that cause trouble with this controller. | 295 | * Block UDMA on devices that cause trouble with this controller. |
298 | */ | 296 | */ |
299 | 297 | ||
300 | static unsigned long hpt370a_filter(const struct ata_port *ap, struct ata_device *adev, unsigned long mask) | 298 | static unsigned long hpt370a_filter(struct ata_device *adev, unsigned long mask) |
301 | { | 299 | { |
302 | if (adev->class != ATA_DEV_ATA) { | 300 | if (adev->class != ATA_DEV_ATA) { |
303 | if (hpt_dma_blacklisted(adev, "UDMA100", bad_ata100_5)) | 301 | if (hpt_dma_blacklisted(adev, "UDMA100", bad_ata100_5)) |
304 | mask &= ~ (0x1F << ATA_SHIFT_UDMA); | 302 | mask &= ~ (0x1F << ATA_SHIFT_UDMA); |
305 | } | 303 | } |
306 | return ata_pci_default_filter(ap, adev, mask); | 304 | return ata_pci_default_filter(adev, mask); |
307 | } | 305 | } |
308 | 306 | ||
309 | /** | 307 | /** |