lkml.org 
[lkml]   [2009]   [Feb]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 15/41] sata_nv: rename nv_nf2_hardreset()
    2.6.27-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Tejun Heo <tj@kernel.org>

    commit e8caa3c70e94d867ca2efe9e53fd388b52d6d0c8 upstream.

    nv_nf2_hardreset() will be used by other flavors too. Rename it to
    nv_noclassify_hardreset().

    Signed-off-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/ata/sata_nv.c | 28 ++++++++++++++--------------
    1 file changed, 14 insertions(+), 14 deletions(-)

    --- a/drivers/ata/sata_nv.c
    +++ b/drivers/ata/sata_nv.c
    @@ -305,10 +305,10 @@ static irqreturn_t nv_ck804_interrupt(in
    static int nv_scr_read(struct ata_port *ap, unsigned int sc_reg, u32 *val);
    static int nv_scr_write(struct ata_port *ap, unsigned int sc_reg, u32 val);

    +static int nv_noclassify_hardreset(struct ata_link *link, unsigned int *class,
    + unsigned long deadline);
    static void nv_nf2_freeze(struct ata_port *ap);
    static void nv_nf2_thaw(struct ata_port *ap);
    -static int nv_nf2_hardreset(struct ata_link *link, unsigned int *class,
    - unsigned long deadline);
    static void nv_ck804_freeze(struct ata_port *ap);
    static void nv_ck804_thaw(struct ata_port *ap);
    static int nv_adma_slave_config(struct scsi_device *sdev);
    @@ -432,7 +432,7 @@ static struct ata_port_operations nv_nf2
    .inherits = &nv_common_ops,
    .freeze = nv_nf2_freeze,
    .thaw = nv_nf2_thaw,
    - .hardreset = nv_nf2_hardreset,
    + .hardreset = nv_noclassify_hardreset,
    };

    /* CK804 finally gets hardreset right */
    @@ -1530,6 +1530,17 @@ static int nv_scr_write(struct ata_port
    return 0;
    }

    +static int nv_noclassify_hardreset(struct ata_link *link, unsigned int *class,
    + unsigned long deadline)
    +{
    + bool online;
    + int rc;
    +
    + rc = sata_link_hardreset(link, sata_deb_timing_hotplug, deadline,
    + &online, NULL);
    + return online ? -EAGAIN : rc;
    +}
    +
    static void nv_nf2_freeze(struct ata_port *ap)
    {
    void __iomem *scr_addr = ap->host->ports[0]->ioaddr.scr_addr;
    @@ -1554,17 +1565,6 @@ static void nv_nf2_thaw(struct ata_port
    iowrite8(mask, scr_addr + NV_INT_ENABLE);
    }

    -static int nv_nf2_hardreset(struct ata_link *link, unsigned int *class,
    - unsigned long deadline)
    -{
    - bool online;
    - int rc;
    -
    - rc = sata_link_hardreset(link, sata_deb_timing_hotplug, deadline,
    - &online, NULL);
    - return online ? -EAGAIN : rc;
    -}
    -
    static void nv_ck804_freeze(struct ata_port *ap)
    {
    void __iomem *mmio_base = ap->host->iomap[NV_MMIO_BAR];


    \
     
     \ /
      Last update: 2009-02-04 19:59    [W:0.033 / U:29.576 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site