[Linux-parport] [PATCH 23/32] pata_parport-bpck6: move ppc6_wr_extout to bpck6.c and rename

[Ondrej Zary]

Move ppc6_wr_extout to bpck6.c and rename it to bpck6_wr_extout

Signed-off-by: Ondrej Zary <linux at zary.sk>
---
 drivers/ata/pata_parport/bpck6.c   | 10 ++++++++--
 drivers/ata/pata_parport/ppc6lnx.c | 10 ----------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/drivers/ata/pata_parport/bpck6.c b/drivers/ata/pata_parport/bpck6.c
index 1f976ee04ef2..968c9f3297e3 100644
--- a/drivers/ata/pata_parport/bpck6.c
+++ b/drivers/ata/pata_parport/bpck6.c
@@ -174,18 +174,24 @@ 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 void bpck6_wr_extout(struct pi_adapter *pi, u8 regdata)
+{
+	ppc6_send_cmd(pi, REG_VERSION | ACCESS_REG | ACCESS_WRITE);
+	ppc6_wr_data_byte(pi, (u8)((regdata & 0x03) << 6));
+}
+
 static void bpck6_connect(struct pi_adapter *pi)
 {
 	dev_dbg(&pi->dev, "connect\n");
 
 	ppc6_open(pi);
-	ppc6_wr_extout(pi, 0x3);
+	bpck6_wr_extout(pi, 0x3);
 }
 
 static void bpck6_disconnect(struct pi_adapter *pi)
 {
 	dev_dbg(&pi->dev, "disconnect\n");
-	ppc6_wr_extout(pi, 0x0);
+	bpck6_wr_extout(pi, 0x0);
 	ppc6_deselect(pi);
 }
 
diff --git a/drivers/ata/pata_parport/ppc6lnx.c b/drivers/ata/pata_parport/ppc6lnx.c
index cd4fa31a5ff8..931bf67fabb9 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 void ppc6_wr_extout(struct pi_adapter *pi, u8 regdata);
 static int ppc6_open(struct pi_adapter *pi);
 
 //***************************************************************************
@@ -281,15 +280,6 @@ static u8 ppc6_rd_data_byte(struct pi_adapter *pi)
 
 //***************************************************************************
 
-static void ppc6_wr_extout(struct pi_adapter *pi, u8 regdata)
-{
-	ppc6_send_cmd(pi, REG_VERSION | ACCESS_REG | ACCESS_WRITE);
-
-	ppc6_wr_data_byte(pi, (u8)((regdata & 0x03) << 6));
-}
-
-//***************************************************************************
-
 static int ppc6_open(struct pi_adapter *pi)
 {
 	int ret;
-- 
Ondrej Zary