lkml.org 
[lkml]   [2023]   [Mar]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 24/32] pata_parport-bpck6: move ppc6_open to bpck6.c and rename
    Date
    Move ppc6_open to bpck6.c and rename it to bpck6_open

    Signed-off-by: Ondrej Zary <linux@zary.sk>
    ---
    drivers/ata/pata_parport/bpck6.c | 23 +++++++++++++++++++++--
    drivers/ata/pata_parport/ppc6lnx.c | 28 ----------------------------
    2 files changed, 21 insertions(+), 30 deletions(-)

    diff --git a/drivers/ata/pata_parport/bpck6.c b/drivers/ata/pata_parport/bpck6.c
    index 968c9f3297e3..02f16dedfd29 100644
    --- a/drivers/ata/pata_parport/bpck6.c
    +++ b/drivers/ata/pata_parport/bpck6.c
    @@ -174,6 +174,25 @@ static void bpck6_read_block(struct pi_adapter *pi, char *buf, int len)
    ppc6_send_cmd(pi, CMD_PREFIX_RESET | PREFIX_IO16 | PREFIX_BLK);
    }

    +static int bpck6_open(struct pi_adapter *pi)
    +{
    + int ret = ppc6_select(pi);
    +
    + if (ret == 0)
    + return ret;
    +
    + pi->private = 0;
    +
    + ppc6_send_cmd(pi, ACCESS_REG | ACCESS_WRITE | REG_RAMSIZE);
    + ppc6_wr_data_byte(pi, RAMSIZE_128K);
    +
    + ppc6_send_cmd(pi, ACCESS_REG | ACCESS_READ | REG_VERSION);
    + if ((ppc6_rd_data_byte(pi) & 0x3F) == 0x0C)
    + pi->private |= fifo_wait;
    +
    + return ret;
    +}
    +
    static void bpck6_wr_extout(struct pi_adapter *pi, u8 regdata)
    {
    ppc6_send_cmd(pi, REG_VERSION | ACCESS_REG | ACCESS_WRITE);
    @@ -184,7 +203,7 @@ static void bpck6_connect(struct pi_adapter *pi)
    {
    dev_dbg(&pi->dev, "connect\n");

    - ppc6_open(pi);
    + bpck6_open(pi);
    bpck6_wr_extout(pi, 0x3);
    }

    @@ -218,7 +237,7 @@ static int bpck6_probe_unit(struct pi_adapter *pi)
    /*LOWER DOWN TO UNIDIRECTIONAL*/
    pi->mode = 0;

    - out = ppc6_open(pi);
    + out = bpck6_open(pi);

    dev_dbg(&pi->dev, "ppc_open returned %2x\n", out);

    diff --git a/drivers/ata/pata_parport/ppc6lnx.c b/drivers/ata/pata_parport/ppc6lnx.c
    index 931bf67fabb9..a902ede5ecc5 100644
    --- a/drivers/ata/pata_parport/ppc6lnx.c
    +++ b/drivers/ata/pata_parport/ppc6lnx.c
    @@ -72,7 +72,6 @@ static void ppc6_deselect(struct pi_adapter *pi);
    static void ppc6_send_cmd(struct pi_adapter *pi, u8 cmd);
    static void ppc6_wr_data_byte(struct pi_adapter *pi, u8 data);
    static u8 ppc6_rd_data_byte(struct pi_adapter *pi);
    -static int ppc6_open(struct pi_adapter *pi);

    //***************************************************************************

    @@ -277,30 +276,3 @@ static u8 ppc6_rd_data_byte(struct pi_adapter *pi)

    return(data);
    }
    -
    -//***************************************************************************
    -
    -static int ppc6_open(struct pi_adapter *pi)
    -{
    - int ret;
    -
    - ret = ppc6_select(pi);
    -
    - if (ret == 0)
    - return(ret);
    -
    - pi->private = 0;
    -
    - ppc6_send_cmd(pi, ACCESS_REG | ACCESS_WRITE | REG_RAMSIZE);
    - ppc6_wr_data_byte(pi, RAMSIZE_128K);
    -
    - ppc6_send_cmd(pi, ACCESS_REG | ACCESS_READ | REG_VERSION);
    -
    - if ((ppc6_rd_data_byte(pi) & 0x3F) == 0x0C)
    - pi->private |= fifo_wait;
    -
    - return(ret);
    -}
    -
    -//***************************************************************************
    -
    --
    Ondrej Zary
    \
     
     \ /
      Last update: 2023-03-27 00:48    [W:3.066 / U:0.232 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site