summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorOndrej Zary <linux@zary.sk>2023-03-08 01:46:27 +0300
committerDamien Le Moal <damien.lemoal@opensource.wdc.com>2023-03-23 06:22:20 +0300
commit083ad04d317249ed35e54dd805cbc325e3e84424 (patch)
tree7922ce85d85c29fc3048744f6b472da03c2dd96a /drivers
parent49745f621a2a850c68d5e6c2967a88d811027a97 (diff)
downloadlinux-083ad04d317249ed35e54dd805cbc325e3e84424.tar.xz
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ata/pata_parport/bpck6.c48
1 files changed, 25 insertions, 23 deletions
diff --git a/drivers/ata/pata_parport/bpck6.c b/drivers/ata/pata_parport/bpck6.c
index 53d0ad1d6e89..295dbe5cdaa4 100644
--- 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);