diff mbox series

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

Message ID	20230307224627.28011-33-linux@zary.sk
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; From: Ondrej Zary <linux@zary.sk> To: Damien Le Moal <damien.lemoal@opensource.wdc.com>, Sudip Mukherjee <sudipm.mukherjee@gmail.com> Cc: Christoph Hellwig <hch@lst.de>, Sergey Shtylyov <s.shtylyov@omp.ru>, Jens Axboe <axboe@kernel.dk>, Tim Waugh <tim@cyberelk.net>, linux-block@vger.kernel.org, linux-parport@lists.infradead.org, linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 32/32] pata_parport-bpck6: reduce indents in bpck6_open Date: Tue, 7 Mar 2023 23:46:27 +0100 Message-Id: <20230307224627.28011-33-linux@zary.sk> In-Reply-To: <20230307224627.28011-1-linux@zary.sk> References: <20230307224627.28011-1-linux@zary.sk> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	pata_parport-bpck6: rework bpck6 protocol driver \| [00/32] pata_parport-bpck6: rework bpck6 protocol driver [01/32] pata_parport-bpck6: remove useless defines [02/32] pata_parport-bpck6: remove useless range check from read/write_regr [03/32] pata_parport-bpck6: don't cast pi->pardev to struct pardevice * [04/32] pata_parport-bpck6: pass around struct pi_adapter * [05/32] pata_parport-bpck6: remove lpt_addr from struct ppc_storage [06/32] pata_parport-bpck6: remove ppc_id from struct ppc_storage [07/32] pata_parport-bpck6: remove org_* from struct ppc_storage [08/32] pata_parport-bpck6: remove mode from struct ppc_storage [09/32] pata_parport-bpck6: remove struct ppc_storage [10/32] pata_parport-bpck6: remove parallel port bit defines [11/32] parport_pc: add 16-bit and 8-bit fast EPP transfer flags [12/32] pata_parport-bpck6: use parport access functions instead of port I/O [13/32] pata_parport-bpck6: use parport_frob_control and remove CUR_CTRL [14/32] pata_parport-bpck6: remove PPC_FLAGS [15/32] pata_parport-bpck6: remove ppc6_close [16/32] pata_parport-bpck6: merge ppc6_rd_port into bpck6_read_regr [17/32] pata_parport-bpck6: merge ppc6_wr_port into bpck6_write_regr [18/32] pata_parport-bpck6: merge ppc6_rd_port16_blk into bpck6_read_block [19/32] pata_parport-bpck6: merge ppc6_wr_port16_blk into bpck6_write_block [20/32] pata_parport-bpck6: merge ppc6_rd_data_blk into bpck6_read_block [21/32] pata_parport-bpck6: merge ppc6_wr_data_blk into bpck6_write_block [22/32] pata_parport-bpck6: move ppc6_wait_for_fifo to bpck6.c and rename [23/32] pata_parport-bpck6: move ppc6_wr_extout to bpck6.c and rename [24/32] pata_parport-bpck6: move ppc6_open to bpck6.c and rename [25/32] pata_parport-bpck6: merge ppc6_select into bpck6_open [26/32] pata_parport-bpck6: move ppc6_deselect to bpck6.c and rename [27/32] pata_parport-bpck6: move ppc6_send_cmd to bpck6.c and rename [28/32] pata_parport-bpck6: move ppc6_rd_data_byte to bpck6.c and rename [29/32] pata_parport-bpck6: move ppc6_wr_data_byte to bpck6.c and rename [30/32] pata_parport-bpck6: move defines and mode_map to bpck6.c [31/32] pata_parport-bpck6: delete ppc6lnx.c [32/32] pata_parport-bpck6: reduce indents in bpck6_open

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