diff mbox series

[32/32] pata_parport-bpck6: reduce indents in bpck6_open

Message ID 20230307224627.28011-33-linux@zary.sk (mailing list archive)
State New, archived
Headers show
Series pata_parport-bpck6: rework bpck6 protocol driver | expand

Commit Message

Ondrej Zary March 7, 2023, 10:46 p.m. UTC 
Reverse error handling conditions to reduce code indents in bpck6_open.

Signed-off-by: Ondrej Zary <linux@zary.sk>
---
 drivers/ata/pata_parport/bpck6.c | 48 +++++++++++++++++---------------
 1 file changed, 25 insertions(+), 23 deletions(-)
diff mbox series

Patch

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);