ata: pata_parport-bpck6: merge ppc6_select into bpck6_open

ppc6_select is only called by bpck6_open. Merge ppc6_select into
bpck6_open.

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 02f16dedfd29b888f4ee10da285fd7868d98e5e5..9b05e1c827cddd00460d6565977c533f781fe509 100644 (file)
--- a/drivers/ata/pata_parport/bpck6.c
+++ b/drivers/ata/pata_parport/bpck6.c
@@ -176,21 +176,63 @@ static void bpck6_read_block(struct pi_adapter *pi, char *buf, int len)
 
 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);
+       u8 i, j, k;
+
+       pi->saved_r0 = parport_read_data(pi->pardev->port);
+       pi->saved_r2 = parport_read_control(pi->pardev->port) & 0x5F;
+
+       parport_frob_control(pi->pardev->port, PARPORT_CONTROL_SELECT,
+                                               PARPORT_CONTROL_SELECT);
+       if (pi->saved_r0 == 'b')
+               parport_write_data(pi->pardev->port, 'x');
+       parport_write_data(pi->pardev->port, 'b');
+       parport_write_data(pi->pardev->port, 'p');
+       parport_write_data(pi->pardev->port, pi->unit);
+       parport_write_data(pi->pardev->port, ~pi->unit);
+
+       parport_frob_control(pi->pardev->port, PARPORT_CONTROL_SELECT, 0);
+       parport_write_control(pi->pardev->port, PARPORT_CONTROL_INIT);
+
+       i = mode_map[pi->mode] & 0x0C;
+       if (i == 0)
+               i = (mode_map[pi->mode] & 2) | 1;
+       parport_write_data(pi->pardev->port, i);
+
+       parport_frob_control(pi->pardev->port, PARPORT_CONTROL_SELECT,
+                                               PARPORT_CONTROL_SELECT);
+       parport_frob_control(pi->pardev->port, PARPORT_CONTROL_AUTOFD,
+                                               PARPORT_CONTROL_AUTOFD);
+
+       j = ((i & 0x08) << 4) | ((i & 0x07) << 3);
+       k = parport_read_status(pi->pardev->port) & 0xB8;
+       if (j == k) {
+               parport_frob_control(pi->pardev->port, PARPORT_CONTROL_AUTOFD, 0);
+               k = (parport_read_status(pi->pardev->port) & 0xB8) ^ 0xB8;
+               if (j == k) {
+                       if (i & 4)      // EPP
+                               parport_frob_control(pi->pardev->port,
+                                       PARPORT_CONTROL_SELECT | PARPORT_CONTROL_INIT, 0);
+                       else                            // PPC/ECP
+                               parport_frob_control(pi->pardev->port,
+                                       PARPORT_CONTROL_SELECT, 0);
+
+                       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 1;
+               }
+       }
 
-       ppc6_send_cmd(pi, ACCESS_REG | ACCESS_READ | REG_VERSION);
-       if ((ppc6_rd_data_byte(pi) & 0x3F) == 0x0C)
-               pi->private |= fifo_wait;
+       parport_write_control(pi->pardev->port, pi->saved_r2);
+       parport_write_data(pi->pardev->port, pi->saved_r0);
 
-       return ret;
+       return 0; // FAIL
 }
 
 static void bpck6_wr_extout(struct pi_adapter *pi, u8 regdata)

diff --git a/drivers/ata/pata_parport/ppc6lnx.c b/drivers/ata/pata_parport/ppc6lnx.c
index a902ede5ecc5d134c8c2420b011e40adf5f1a457..16d0497dfeaa097981cddcbabcf2a127df0adb38 100644 (file)
--- a/drivers/ata/pata_parport/ppc6lnx.c
+++ b/drivers/ata/pata_parport/ppc6lnx.c
@@ -67,7 +67,6 @@
 
 //***************************************************************************
 
-static int ppc6_select(struct pi_adapter *pi);
 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);
@@ -78,71 +77,6 @@ static u8 ppc6_rd_data_byte(struct pi_adapter *pi);
 int mode_map[] = { PPCMODE_UNI_FW, PPCMODE_BI_FW, PPCMODE_EPP_BYTE,
                   PPCMODE_EPP_WORD, PPCMODE_EPP_DWORD };
 
-static int ppc6_select(struct pi_adapter *pi)
-{
-       u8 i, j, k;
-
-       pi->saved_r0 = parport_read_data(pi->pardev->port);
-
-       pi->saved_r2 = parport_read_control(pi->pardev->port) & 0x5F; // readback ctrl
-
-       parport_frob_control(pi->pardev->port, PARPORT_CONTROL_SELECT, PARPORT_CONTROL_SELECT);
-
-       if (pi->saved_r0 == 'b')
-               parport_write_data(pi->pardev->port, 'x');
-
-       parport_write_data(pi->pardev->port, 'b');
-       parport_write_data(pi->pardev->port, 'p');
-       parport_write_data(pi->pardev->port, pi->unit);
-       parport_write_data(pi->pardev->port, ~pi->unit);
-
-       parport_frob_control(pi->pardev->port, PARPORT_CONTROL_SELECT, 0);
-
-       parport_write_control(pi->pardev->port, PARPORT_CONTROL_INIT);
-
-       i = mode_map[pi->mode] & 0x0C;
-
-       if (i == 0)
-               i = (mode_map[pi->mode] & 2) | 1;
-
-       parport_write_data(pi->pardev->port, i);
-
-       parport_frob_control(pi->pardev->port, PARPORT_CONTROL_SELECT, PARPORT_CONTROL_SELECT);
-
-       // DELAY
-
-       parport_frob_control(pi->pardev->port, PARPORT_CONTROL_AUTOFD, PARPORT_CONTROL_AUTOFD);
-
-       j = ((i & 0x08) << 4) | ((i & 0x07) << 3);
-
-       k = parport_read_status(pi->pardev->port) & 0xB8;
-
-       if (j == k)
-       {
-               parport_frob_control(pi->pardev->port, PARPORT_CONTROL_AUTOFD, 0);
-
-               k = (parport_read_status(pi->pardev->port) & 0xB8) ^ 0xB8;
-
-               if (j == k)
-               {
-                       if (i & 4)      // EPP
-                               parport_frob_control(pi->pardev->port,
-                                       PARPORT_CONTROL_SELECT | PARPORT_CONTROL_INIT, 0);
-                       else                            // PPC/ECP
-                               parport_frob_control(pi->pardev->port,
-                                       PARPORT_CONTROL_SELECT, 0);
-
-                       return(1);
-               }
-       }
-
-       parport_write_control(pi->pardev->port, pi->saved_r2);
-
-       parport_write_data(pi->pardev->port, pi->saved_r0);
-
-       return(0); // FAIL
-}
-
 //***************************************************************************
 
 static void ppc6_deselect(struct pi_adapter *pi)