ata: pata_parport-bpck6: merge ppc6_wr_port into bpck6_write_regr

ppc6_wr_port is only called by bpck6_write_regr. Merge ppc6_wr_port
into bpck6_write_regr.

Signed-off-by: Ondrej Zary <linux@zary.sk>
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>

diff --git a/drivers/ata/pata_parport/bpck6.c b/drivers/ata/pata_parport/bpck6.c
index 2918fc9e9def74180c6193e477459af14192e679..8e0094e3b02b1fa077a11c44aaac371b60591242 100644 (file)
--- a/drivers/ata/pata_parport/bpck6.c
+++ b/drivers/ata/pata_parport/bpck6.c
@@ -29,7 +29,10 @@ static int bpck6_read_regr(struct pi_adapter *pi, int cont, int reg)
 
 static void bpck6_write_regr(struct pi_adapter *pi, int cont, int reg, int val)
 {
-       ppc6_wr_port(pi, cont?reg|8:reg, val);
+       u8 port = cont ? reg | 8 : reg;
+
+       ppc6_send_cmd(pi, port | ACCESS_PORT | ACCESS_WRITE);
+       ppc6_wr_data_byte(pi, val);
 }
 
 static void bpck6_write_block(struct pi_adapter *pi, char *buf, int len)

diff --git a/drivers/ata/pata_parport/ppc6lnx.c b/drivers/ata/pata_parport/ppc6lnx.c
index 23dce177b7224d12ad73bedc09d818863888e644..35427742e4d354e1907ab0407baa8e392827391f 100644 (file)
--- 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 void ppc6_wr_port(struct pi_adapter *pi, u8 port, u8 data);
 static void ppc6_rd_data_blk(struct pi_adapter *pi, u8 *data, long count);
 static void ppc6_wait_for_fifo(struct pi_adapter *pi);
 static void ppc6_wr_data_blk(struct pi_adapter *pi, u8 *data, long count);
@@ -287,15 +286,6 @@ static u8 ppc6_rd_data_byte(struct pi_adapter *pi)
 
 //***************************************************************************
 
-static void ppc6_wr_port(struct pi_adapter *pi, u8 port, u8 data)
-{
-       ppc6_send_cmd(pi, port | ACCESS_PORT | ACCESS_WRITE);
-
-       ppc6_wr_data_byte(pi, data);
-}
-
-//***************************************************************************
-
 static void ppc6_rd_data_blk(struct pi_adapter *pi, u8 *data, long count)
 {
        switch (mode_map[pi->mode])