diff options
author | Tejun Heo <htejun@gmail.com> | 2008-03-25 09:16:44 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-04-17 15:44:18 -0400 |
commit | 6fd36390117f7844ad147377878ddb52088f583a (patch) | |
tree | c25d9a8357ff173ce46eb057cc50370b87b9cca8 /drivers/ata/sata_inic162x.c | |
parent | 3d5a3d67a578d95ac3a11a862d16a054e2d4d9cd (diff) |
libata: kill ata_chk_status()
ata_chk_status() just calls ops->check_status and it only adds
confusion with other status functions. Kill it.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/sata_inic162x.c')
-rw-r--r-- | drivers/ata/sata_inic162x.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c index ba1c09953517..12fbf3868fe2 100644 --- a/drivers/ata/sata_inic162x.c +++ b/drivers/ata/sata_inic162x.c | |||
@@ -267,14 +267,14 @@ static void inic_host_intr(struct ata_port *ap) | |||
267 | ata_qc_from_tag(ap, ap->link.active_tag); | 267 | ata_qc_from_tag(ap, ap->link.active_tag); |
268 | 268 | ||
269 | if (unlikely(!qc || (qc->tf.flags & ATA_TFLAG_POLLING))) { | 269 | if (unlikely(!qc || (qc->tf.flags & ATA_TFLAG_POLLING))) { |
270 | ata_chk_status(ap); /* clear ATA interrupt */ | 270 | ap->ops->check_status(ap); /* clear ATA interrupt */ |
271 | return; | 271 | return; |
272 | } | 272 | } |
273 | 273 | ||
274 | if (likely(ata_host_intr(ap, qc))) | 274 | if (likely(ata_host_intr(ap, qc))) |
275 | return; | 275 | return; |
276 | 276 | ||
277 | ata_chk_status(ap); /* clear ATA interrupt */ | 277 | ap->ops->check_status(ap); /* clear ATA interrupt */ |
278 | ata_port_printk(ap, KERN_WARNING, "unhandled " | 278 | ata_port_printk(ap, KERN_WARNING, "unhandled " |
279 | "interrupt, irq_stat=%x\n", irq_stat); | 279 | "interrupt, irq_stat=%x\n", irq_stat); |
280 | return; | 280 | return; |
@@ -351,7 +351,7 @@ static unsigned int inic_qc_issue(struct ata_queued_cmd *qc) | |||
351 | */ | 351 | */ |
352 | if (unlikely(qc->tf.command == ATA_CMD_ID_ATA || | 352 | if (unlikely(qc->tf.command == ATA_CMD_ID_ATA || |
353 | qc->tf.command == ATA_CMD_ID_ATAPI)) { | 353 | qc->tf.command == ATA_CMD_ID_ATAPI)) { |
354 | u8 stat = ata_chk_status(ap); | 354 | u8 stat = ap->ops->check_status(ap); |
355 | if (stat == 0x7f || stat == 0xff) | 355 | if (stat == 0x7f || stat == 0xff) |
356 | return AC_ERR_HSM; | 356 | return AC_ERR_HSM; |
357 | } | 357 | } |
@@ -365,7 +365,7 @@ static void inic_freeze(struct ata_port *ap) | |||
365 | 365 | ||
366 | __inic_set_pirq_mask(ap, PIRQ_MASK_FREEZE); | 366 | __inic_set_pirq_mask(ap, PIRQ_MASK_FREEZE); |
367 | 367 | ||
368 | ata_chk_status(ap); | 368 | ap->ops->check_status(ap); |
369 | writeb(0xff, port_base + PORT_IRQ_STAT); | 369 | writeb(0xff, port_base + PORT_IRQ_STAT); |
370 | 370 | ||
371 | readb(port_base + PORT_IRQ_STAT); /* flush */ | 371 | readb(port_base + PORT_IRQ_STAT); /* flush */ |
@@ -375,7 +375,7 @@ static void inic_thaw(struct ata_port *ap) | |||
375 | { | 375 | { |
376 | void __iomem *port_base = inic_port_base(ap); | 376 | void __iomem *port_base = inic_port_base(ap); |
377 | 377 | ||
378 | ata_chk_status(ap); | 378 | ap->ops->check_status(ap); |
379 | writeb(0xff, port_base + PORT_IRQ_STAT); | 379 | writeb(0xff, port_base + PORT_IRQ_STAT); |
380 | 380 | ||
381 | __inic_set_pirq_mask(ap, PIRQ_MASK_OTHER); | 381 | __inic_set_pirq_mask(ap, PIRQ_MASK_OTHER); |