ppc6_wr_data_blk is only called by bpck6_write_block. Merge ppc6_wr_data_blk into bpck6_write_block. Signed-off-by: Ondrej Zary <linux@xxxxxxx> --- drivers/ata/pata_parport/bpck6.c | 58 ++++++++++++++++++- drivers/ata/pata_parport/ppc6lnx.c | 91 ------------------------------ 2 files changed, 57 insertions(+), 92 deletions(-) diff --git a/drivers/ata/pata_parport/bpck6.c b/drivers/ata/pata_parport/bpck6.c index d379603424ff..27c1fa3bb336 100644 --- a/drivers/ata/pata_parport/bpck6.c +++ b/drivers/ata/pata_parport/bpck6.c @@ -37,6 +37,8 @@ static void bpck6_write_regr(struct pi_adapter *pi, int cont, int reg, int val) static void bpck6_write_block(struct pi_adapter *pi, char *buf, int len) { + u8 this, last; + ppc6_send_cmd(pi, REG_BLKSIZE | ACCESS_REG | ACCESS_WRITE); ppc6_wr_data_byte(pi, (u8)len); ppc6_wr_data_byte(pi, (u8)(len >> 8)); @@ -44,7 +46,61 @@ static void bpck6_write_block(struct pi_adapter *pi, char *buf, int len) ppc6_send_cmd(pi, CMD_PREFIX_SET | PREFIX_IO16 | PREFIX_BLK); ppc6_send_cmd(pi, ATA_REG_DATA | ACCESS_PORT | ACCESS_WRITE); - ppc6_wr_data_blk(pi, buf, len); + + switch (mode_map[pi->mode]) { + case PPCMODE_UNI_SW: + case PPCMODE_BI_SW: + while (len--) { + parport_write_data(pi->pardev->port, *buf++); + parport_frob_control(pi->pardev->port, 0, + PARPORT_CONTROL_INIT); + } + break; + case PPCMODE_UNI_FW: + case PPCMODE_BI_FW: + ppc6_send_cmd(pi, CMD_PREFIX_SET | PREFIX_FASTWR); + + parport_frob_control(pi->pardev->port, PARPORT_CONTROL_STROBE, + PARPORT_CONTROL_STROBE); + + last = *buf; + + parport_write_data(pi->pardev->port, last); + + while (len) { + this = *buf++; + len--; + + if (this == last) { + parport_frob_control(pi->pardev->port, 0, + PARPORT_CONTROL_INIT); + } else { + parport_write_data(pi->pardev->port, this); + last = this; + } + } + + parport_frob_control(pi->pardev->port, PARPORT_CONTROL_STROBE, + 0); + ppc6_send_cmd(pi, CMD_PREFIX_RESET | PREFIX_FASTWR); + break; + case PPCMODE_EPP_BYTE: + pi->pardev->port->ops->epp_write_data(pi->pardev->port, buf, + len, PARPORT_EPP_FAST_8); + ppc6_wait_for_fifo(pi); + break; + case PPCMODE_EPP_WORD: + pi->pardev->port->ops->epp_write_data(pi->pardev->port, buf, + len, PARPORT_EPP_FAST_16); + ppc6_wait_for_fifo(pi); + break; + case PPCMODE_EPP_DWORD: + pi->pardev->port->ops->epp_write_data(pi->pardev->port, buf, + len, PARPORT_EPP_FAST_32); + ppc6_wait_for_fifo(pi); + break; + } + ppc6_send_cmd(pi, CMD_PREFIX_RESET | PREFIX_IO16 | PREFIX_BLK); } diff --git a/drivers/ata/pata_parport/ppc6lnx.c b/drivers/ata/pata_parport/ppc6lnx.c index 679261e19ac5..3ba920251c1c 100644 --- a/drivers/ata/pata_parport/ppc6lnx.c +++ b/drivers/ata/pata_parport/ppc6lnx.c @@ -73,7 +73,6 @@ 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 void ppc6_wait_for_fifo(struct pi_adapter *pi); -static void ppc6_wr_data_blk(struct pi_adapter *pi, u8 *data, long count); static void ppc6_wr_extout(struct pi_adapter *pi, u8 regdata); static int ppc6_open(struct pi_adapter *pi); @@ -296,96 +295,6 @@ static void ppc6_wait_for_fifo(struct pi_adapter *pi) //*************************************************************************** -static void ppc6_wr_data_blk(struct pi_adapter *pi, u8 *data, long count) -{ - switch (mode_map[pi->mode]) - { - case PPCMODE_UNI_SW : - case PPCMODE_BI_SW : - { - while(count--) - { - parport_write_data(pi->pardev->port, *data++); - - parport_frob_control(pi->pardev->port, 0, PARPORT_CONTROL_INIT); - } - - break; - } - - case PPCMODE_UNI_FW : - case PPCMODE_BI_FW : - { - u8 this, last; - - ppc6_send_cmd(pi, CMD_PREFIX_SET | PREFIX_FASTWR); - - parport_frob_control(pi->pardev->port, - PARPORT_CONTROL_STROBE, PARPORT_CONTROL_STROBE); - - last = *data; - - parport_write_data(pi->pardev->port, last); - - while(count) - { - this = *data++; - count--; - - if (this == last) - { - parport_frob_control(pi->pardev->port, - 0, PARPORT_CONTROL_INIT); - } - else - { - parport_write_data(pi->pardev->port, this); - - last = this; - } - } - - parport_frob_control(pi->pardev->port, PARPORT_CONTROL_STROBE, 0); - - ppc6_send_cmd(pi, CMD_PREFIX_RESET | PREFIX_FASTWR); - - break; - } - - case PPCMODE_EPP_BYTE : - { - pi->pardev->port->ops->epp_write_data(pi->pardev->port, - data, count, PARPORT_EPP_FAST_8); - - ppc6_wait_for_fifo(pi); - - break; - } - - case PPCMODE_EPP_WORD : - { - pi->pardev->port->ops->epp_write_data(pi->pardev->port, - data, count, PARPORT_EPP_FAST_16); - - ppc6_wait_for_fifo(pi); - - break; - } - - case PPCMODE_EPP_DWORD : - { - pi->pardev->port->ops->epp_write_data(pi->pardev->port, - data, count, PARPORT_EPP_FAST_32); - - ppc6_wait_for_fifo(pi); - - break; - } - } -} - -//*************************************************************************** - static void ppc6_wr_extout(struct pi_adapter *pi, u8 regdata) { ppc6_send_cmd(pi, REG_VERSION | ACCESS_REG | ACCESS_WRITE); -- Ondrej Zary