ata: pata_parport-bpck6: reduce indents in bpck6_open

Reverse error handling conditions to reduce code indents in 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 53d0ad1d6e8966955f8d2ba784a8bf0f135478cd..295dbe5cdaa44be3b526e50c29978c77ed16537b 100644 (file)
--- a/drivers/ata/pata_parport/bpck6.c
+++ b/drivers/ata/pata_parport/bpck6.c
@@ -318,30 +318,32 @@ static int bpck6_open(struct pi_adapter *pi)
 
        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;
-
-                       bpck6_send_cmd(pi, ACCESS_REG | ACCESS_WRITE | REG_RAMSIZE);
-                       bpck6_wr_data_byte(pi, RAMSIZE_128K);
-
-                       bpck6_send_cmd(pi, ACCESS_REG | ACCESS_READ | REG_VERSION);
-                       if ((bpck6_rd_data_byte(pi) & 0x3F) == 0x0C)
-                               pi->private |= fifo_wait;
-
-                       return 1;
-               }
-       }
+       if (j != k)
+               goto fail;
+
+       parport_frob_control(pi->pardev->port, PARPORT_CONTROL_AUTOFD, 0);
+       k = (parport_read_status(pi->pardev->port) & 0xB8) ^ 0xB8;
+       if (j != k)
+               goto fail;
+
+       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;
+
+       bpck6_send_cmd(pi, ACCESS_REG | ACCESS_WRITE | REG_RAMSIZE);
+       bpck6_wr_data_byte(pi, RAMSIZE_128K);
+
+       bpck6_send_cmd(pi, ACCESS_REG | ACCESS_READ | REG_VERSION);
+       if ((bpck6_rd_data_byte(pi) & 0x3F) == 0x0C)
+               pi->private |= fifo_wait;
+
+       return 1;
 
+fail:
        parport_write_control(pi->pardev->port, pi->saved_r2);
        parport_write_data(pi->pardev->port, pi->saved_r0);