libata: make sff_irq_on() method optional

Now, with the introduction of the sff_set_devctl() method, we can
use it in sff_irq_on() method too -- that way its implementations
in 'pata_bf54x' and 'pata_scc' become virtually identical to
ata_sff_irq_on().  The sff_irq_on() method now becomes quite
superfluous, and the only reason not to remove it completely is
the existence of the 'pata_octeon_cf' driver which implements it
as an empty function. Just make the method optional then, with
ata_sff_irq_on() becoming generic taskfile-bound function, still
global for the 'pata_bf54x' driver to be able to call it from its
thaw() and postreset() methods.

While at it, make the sff_irq_on() method and ata_sff_irq_on() return
'void' as the result is always ignored anyway.

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

1 files changed, 0 insertions, 24 deletions

diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c
index 86b25fef34a9..d3988991ca68 100644
--- a/drivers/ata/pata_scc.c
+++ b/drivers/ata/pata_scc.c
@@ -828,29 +828,6 @@ static unsigned int scc_data_xfer (struct ata_device *dev, unsigned char *buf,
 }
 
 /**
- *      scc_irq_on - Enable interrupts on a port.
- *      @ap: Port on which interrupts are enabled.
- *
- *      Note: Original code is ata_sff_irq_on().
- */
-
-static u8 scc_irq_on (struct ata_port *ap)
-{
-        struct ata_ioports *ioaddr = &ap->ioaddr;
-        u8 tmp;
-
-        ap->ctl &= ~ATA_NIEN;
-        ap->last_ctl = ap->ctl;
-
-        out_be32(ioaddr->ctl_addr, ap->ctl);
-        tmp = ata_wait_idle(ap);
-
-        ap->ops->sff_irq_clear(ap);
-
-        return tmp;
-}
-
-/**
  *      scc_pata_prereset - prepare for reset
  *      @ap: ATA port to be reset
  *      @deadline: deadline jiffies for the operation
@@ -977,7 +954,6 @@ static struct ata_port_operations scc_pata_ops = {
         .post_internal_cmd      = scc_bmdma_stop,
 
         .sff_irq_clear          = scc_irq_clear,
-        .sff_irq_on             = scc_irq_on,
 
         .port_start             = scc_port_start,
         .port_stop              = scc_port_stop,