From nobody Wed Sep 10 05:57:20 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 026C3C678D5 for ; Tue, 7 Mar 2023 22:48:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231822AbjCGWsI (ORCPT ); Tue, 7 Mar 2023 17:48:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33422 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230430AbjCGWrL (ORCPT ); Tue, 7 Mar 2023 17:47:11 -0500 Received: from hosting.gsystem.sk (hosting.gsystem.sk [212.5.213.30]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id C3E47136DA; Tue, 7 Mar 2023 14:47:01 -0800 (PST) Received: from gsql.ggedos.sk (off-20.infotel.telecom.sk [212.5.213.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by hosting.gsystem.sk (Postfix) with ESMTPSA id CC22D7A06F6; Tue, 7 Mar 2023 23:46:48 +0100 (CET) From: Ondrej Zary To: Damien Le Moal , Sudip Mukherjee Cc: Christoph Hellwig , Sergey Shtylyov , Jens Axboe , Tim Waugh , linux-block@vger.kernel.org, linux-parport@lists.infradead.org, linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 09/32] pata_parport-bpck6: remove struct ppc_storage Date: Tue, 7 Mar 2023 23:46:04 +0100 Message-Id: <20230307224627.28011-10-linux@zary.sk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20230307224627.28011-1-linux@zary.sk> References: <20230307224627.28011-1-linux@zary.sk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Store the remaining two variables (cur_ctrl and ppc_flags) in struct ppc_storage directly in pi->private and remove struct ppc_storage. Signed-off-by: Ondrej Zary Reviewed-by: Sergey Shtylyov --- drivers/ata/pata_parport/bpck6.c | 21 ---- drivers/ata/pata_parport/ppc6lnx.c | 149 +++++++++++++---------------- 2 files changed, 69 insertions(+), 101 deletions(-) diff --git a/drivers/ata/pata_parport/bpck6.c b/drivers/ata/pata_parport/bp= ck6.c index fe97d1dee51c..dc0f71cc305e 100644 --- a/drivers/ata/pata_parport/bpck6.c +++ b/drivers/ata/pata_parport/bpck6.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include @@ -107,24 +106,6 @@ static void bpck6_log_adapter(struct pi_adapter *pi) pi->unit, pi->port, pi->mode, mode_string[pi->mode], pi->delay); } =20 -static int bpck6_init_proto(struct pi_adapter *pi) -{ - struct ppc_storage *p =3D kzalloc(sizeof(struct ppc_storage), GFP_KERNEL); - - if (p) { - pi->private =3D (unsigned long)p; - return 0; - } - - dev_err(&pi->dev, "ERROR COULDN'T ALLOCATE MEMORY\n"); - return -1; -} - -static void bpck6_release_proto(struct pi_adapter *pi) -{ - kfree((void *)(pi->private));=20 -} - static struct pi_protocol bpck6 =3D { .owner =3D THIS_MODULE, .name =3D "bpck6", @@ -140,8 +121,6 @@ static struct pi_protocol bpck6 =3D { .test_port =3D bpck6_test_port, .probe_unit =3D bpck6_probe_unit, .log_adapter =3D bpck6_log_adapter, - .init_proto =3D bpck6_init_proto, - .release_proto =3D bpck6_release_proto, }; =20 MODULE_LICENSE("GPL"); diff --git a/drivers/ata/pata_parport/ppc6lnx.c b/drivers/ata/pata_parport/= ppc6lnx.c index 75f9748d8de5..ee8cee6bae7c 100644 --- a/drivers/ata/pata_parport/ppc6lnx.c +++ b/drivers/ata/pata_parport/ppc6lnx.c @@ -64,10 +64,8 @@ =20 //************************************************************************= *** =20 -struct ppc_storage { - u8 ppc_flags; - u8 cur_ctrl; // current control port contents -}; +#define CUR_CTRL (((u8 *)&pi->private)[0]) +#define PPC_FLAGS (((u8 *)&pi->private)[1]) =20 //************************************************************************= *** =20 @@ -112,7 +110,6 @@ int mode_map[] =3D { PPCMODE_UNI_FW, PPCMODE_BI_FW, PPC= MODE_EPP_BYTE, =20 static int ppc6_select(struct pi_adapter *pi) { - struct ppc_storage *ppc =3D (void *)(pi->private); u8 i, j, k; =20 i =3D inb(pi->port + 1); @@ -124,11 +121,11 @@ static int ppc6_select(struct pi_adapter *pi) =20 pi->saved_r2 =3D inb(pi->port + 2) & 0x5F; // readback ctrl =20 - ppc->cur_ctrl =3D pi->saved_r2; + CUR_CTRL =3D pi->saved_r2; =20 - ppc->cur_ctrl |=3D port_sel; + CUR_CTRL |=3D port_sel; =20 - outb(ppc->cur_ctrl, pi->port + 2); + outb(CUR_CTRL, pi->port + 2); =20 if (pi->saved_r0 =3D=3D 'b') outb('x', pi->port); @@ -138,13 +135,13 @@ static int ppc6_select(struct pi_adapter *pi) outb(pi->unit, pi->port); outb(~pi->unit, pi->port); =20 - ppc->cur_ctrl &=3D ~port_sel; + CUR_CTRL &=3D ~port_sel; =20 - outb(ppc->cur_ctrl, pi->port + 2); + outb(CUR_CTRL, pi->port + 2); =20 - ppc->cur_ctrl =3D (ppc->cur_ctrl & port_int) | port_init; + CUR_CTRL =3D (CUR_CTRL & port_int) | port_init; =20 - outb(ppc->cur_ctrl, pi->port + 2); + outb(CUR_CTRL, pi->port + 2); =20 i =3D mode_map[pi->mode] & 0x0C; =20 @@ -153,15 +150,15 @@ static int ppc6_select(struct pi_adapter *pi) =20 outb(i, pi->port); =20 - ppc->cur_ctrl |=3D port_sel; + CUR_CTRL |=3D port_sel; =20 - outb(ppc->cur_ctrl, pi->port + 2); + outb(CUR_CTRL, pi->port + 2); =20 // DELAY =20 - ppc->cur_ctrl |=3D port_afd; + CUR_CTRL |=3D port_afd; =20 - outb(ppc->cur_ctrl, pi->port + 2); + outb(CUR_CTRL, pi->port + 2); =20 j =3D ((i & 0x08) << 4) | ((i & 0x07) << 3); =20 @@ -169,20 +166,20 @@ static int ppc6_select(struct pi_adapter *pi) =20 if (j =3D=3D k) { - ppc->cur_ctrl &=3D ~port_afd; + CUR_CTRL &=3D ~port_afd; =20 - outb(ppc->cur_ctrl, pi->port + 2); + outb(CUR_CTRL, pi->port + 2); =20 k =3D (inb(pi->port + 1) & 0xB8) ^ 0xB8; =20 if (j =3D=3D k) { if (i & 4) // EPP - ppc->cur_ctrl &=3D ~(port_sel | port_init); + CUR_CTRL &=3D ~(port_sel | port_init); else // PPC/ECP - ppc->cur_ctrl &=3D ~port_sel; + CUR_CTRL &=3D ~port_sel; =20 - outb(ppc->cur_ctrl, pi->port + 2); + outb(CUR_CTRL, pi->port + 2); =20 return(1); } @@ -199,13 +196,12 @@ static int ppc6_select(struct pi_adapter *pi) =20 static void ppc6_deselect(struct pi_adapter *pi) { - struct ppc_storage *ppc =3D (void *)(pi->private); if (mode_map[pi->mode] & 4) // EPP - ppc->cur_ctrl |=3D port_init; + CUR_CTRL |=3D port_init; else // PPC/ECP - ppc->cur_ctrl |=3D port_sel; + CUR_CTRL |=3D port_sel; =20 - outb(ppc->cur_ctrl, pi->port + 2); + outb(CUR_CTRL, pi->port + 2); =20 outb(pi->saved_r0, pi->port); =20 @@ -218,7 +214,6 @@ static void ppc6_deselect(struct pi_adapter *pi) =20 static void ppc6_send_cmd(struct pi_adapter *pi, u8 cmd) { - struct ppc_storage *ppc =3D (void *)(pi->private); switch (mode_map[pi->mode]) { case PPCMODE_UNI_SW : @@ -228,9 +223,9 @@ static void ppc6_send_cmd(struct pi_adapter *pi, u8 cmd) { outb(cmd, pi->port); =20 - ppc->cur_ctrl ^=3D cmd_stb; + CUR_CTRL ^=3D cmd_stb; =20 - outb(ppc->cur_ctrl, pi->port + 2); + outb(CUR_CTRL, pi->port + 2); =20 break; } @@ -250,7 +245,6 @@ static void ppc6_send_cmd(struct pi_adapter *pi, u8 cmd) =20 static void ppc6_wr_data_byte(struct pi_adapter *pi, u8 data) { - struct ppc_storage *ppc =3D (void *)(pi->private); switch (mode_map[pi->mode]) { case PPCMODE_UNI_SW : @@ -260,9 +254,9 @@ static void ppc6_wr_data_byte(struct pi_adapter *pi, u8= data) { outb(data, pi->port); =20 - ppc->cur_ctrl ^=3D data_stb; + CUR_CTRL ^=3D data_stb; =20 - outb(ppc->cur_ctrl, pi->port + 2); + outb(CUR_CTRL, pi->port + 2); =20 break; } @@ -282,7 +276,6 @@ static void ppc6_wr_data_byte(struct pi_adapter *pi, u8= data) =20 static u8 ppc6_rd_data_byte(struct pi_adapter *pi) { - struct ppc_storage *ppc =3D (void *)(pi->private); u8 data =3D 0; =20 switch (mode_map[pi->mode]) @@ -290,9 +283,9 @@ static u8 ppc6_rd_data_byte(struct pi_adapter *pi) case PPCMODE_UNI_SW : case PPCMODE_UNI_FW : { - ppc->cur_ctrl =3D (ppc->cur_ctrl & ~port_stb) ^ data_stb; + CUR_CTRL =3D (CUR_CTRL & ~port_stb) ^ data_stb; =20 - outb(ppc->cur_ctrl, pi->port + 2); + outb(CUR_CTRL, pi->port + 2); =20 // DELAY =20 @@ -300,9 +293,9 @@ static u8 ppc6_rd_data_byte(struct pi_adapter *pi) =20 data =3D ((data & 0x80) >> 1) | ((data & 0x38) >> 3); =20 - ppc->cur_ctrl |=3D port_stb; + CUR_CTRL |=3D port_stb; =20 - outb(ppc->cur_ctrl, pi->port + 2); + outb(CUR_CTRL, pi->port + 2); =20 // DELAY =20 @@ -314,23 +307,23 @@ static u8 ppc6_rd_data_byte(struct pi_adapter *pi) case PPCMODE_BI_SW : case PPCMODE_BI_FW : { - ppc->cur_ctrl |=3D port_dir; + CUR_CTRL |=3D port_dir; =20 - outb(ppc->cur_ctrl, pi->port + 2); + outb(CUR_CTRL, pi->port + 2); =20 - ppc->cur_ctrl =3D (ppc->cur_ctrl | port_stb) ^ data_stb; + CUR_CTRL =3D (CUR_CTRL | port_stb) ^ data_stb; =20 - outb(ppc->cur_ctrl, pi->port + 2); + outb(CUR_CTRL, pi->port + 2); =20 data =3D inb(pi->port); =20 - ppc->cur_ctrl &=3D ~port_stb; + CUR_CTRL &=3D ~port_stb; =20 - outb(ppc->cur_ctrl, pi->port + 2); + outb(CUR_CTRL, pi->port + 2); =20 - ppc->cur_ctrl &=3D ~port_dir; + CUR_CTRL &=3D ~port_dir; =20 - outb(ppc->cur_ctrl, pi->port + 2); + outb(CUR_CTRL, pi->port + 2); =20 break; } @@ -339,11 +332,11 @@ static u8 ppc6_rd_data_byte(struct pi_adapter *pi) case PPCMODE_EPP_WORD : case PPCMODE_EPP_DWORD : { - outb((ppc->cur_ctrl | port_dir), pi->port + 2); + outb((CUR_CTRL | port_dir), pi->port + 2); =20 data =3D inb(pi->port + 4); =20 - outb(ppc->cur_ctrl, pi->port + 2); + outb(CUR_CTRL, pi->port + 2); =20 break; } @@ -374,7 +367,6 @@ static void ppc6_wr_port(struct pi_adapter *pi, u8 port= , u8 data) =20 static void ppc6_rd_data_blk(struct pi_adapter *pi, u8 *data, long count) { - struct ppc_storage *ppc =3D (void *)(pi->private); switch (mode_map[pi->mode]) { case PPCMODE_UNI_SW : @@ -384,9 +376,9 @@ static void ppc6_rd_data_blk(struct pi_adapter *pi, u8 = *data, long count) { u8 d; =20 - ppc->cur_ctrl =3D (ppc->cur_ctrl & ~port_stb) ^ data_stb; + CUR_CTRL =3D (CUR_CTRL & ~port_stb) ^ data_stb; =20 - outb(ppc->cur_ctrl, pi->port + 2); + outb(CUR_CTRL, pi->port + 2); =20 // DELAY =20 @@ -394,9 +386,9 @@ static void ppc6_rd_data_blk(struct pi_adapter *pi, u8 = *data, long count) =20 d =3D ((d & 0x80) >> 1) | ((d & 0x38) >> 3); =20 - ppc->cur_ctrl |=3D port_stb; + CUR_CTRL |=3D port_stb; =20 - outb(ppc->cur_ctrl, pi->port + 2); + outb(CUR_CTRL, pi->port + 2); =20 // DELAY =20 @@ -412,36 +404,36 @@ static void ppc6_rd_data_blk(struct pi_adapter *pi, u= 8 *data, long count) case PPCMODE_BI_SW : case PPCMODE_BI_FW : { - ppc->cur_ctrl |=3D port_dir; + CUR_CTRL |=3D port_dir; =20 - outb(ppc->cur_ctrl, pi->port + 2); + outb(CUR_CTRL, pi->port + 2); =20 - ppc->cur_ctrl |=3D port_stb; + CUR_CTRL |=3D port_stb; =20 while(count) { - ppc->cur_ctrl ^=3D data_stb; + CUR_CTRL ^=3D data_stb; =20 - outb(ppc->cur_ctrl, pi->port + 2); + outb(CUR_CTRL, pi->port + 2); =20 *data++ =3D inb(pi->port); count--; } =20 - ppc->cur_ctrl &=3D ~port_stb; + CUR_CTRL &=3D ~port_stb; =20 - outb(ppc->cur_ctrl, pi->port + 2); + outb(CUR_CTRL, pi->port + 2); =20 - ppc->cur_ctrl &=3D ~port_dir; + CUR_CTRL &=3D ~port_dir; =20 - outb(ppc->cur_ctrl, pi->port + 2); + outb(CUR_CTRL, pi->port + 2); =20 break; } =20 case PPCMODE_EPP_BYTE : { - outb((ppc->cur_ctrl | port_dir), pi->port + 2); + outb((CUR_CTRL | port_dir), pi->port + 2); =20 // DELAY =20 @@ -451,14 +443,14 @@ static void ppc6_rd_data_blk(struct pi_adapter *pi, u= 8 *data, long count) count--; } =20 - outb(ppc->cur_ctrl, pi->port + 2); + outb(CUR_CTRL, pi->port + 2); =20 break; } =20 case PPCMODE_EPP_WORD : { - outb((ppc->cur_ctrl | port_dir), pi->port + 2); + outb((CUR_CTRL | port_dir), pi->port + 2); =20 // DELAY =20 @@ -475,14 +467,14 @@ static void ppc6_rd_data_blk(struct pi_adapter *pi, u= 8 *data, long count) count--; } =20 - outb(ppc->cur_ctrl, pi->port + 2); + outb(CUR_CTRL, pi->port + 2); =20 break; } =20 case PPCMODE_EPP_DWORD : { - outb((ppc->cur_ctrl | port_dir), pi->port + 2); + outb((CUR_CTRL | port_dir), pi->port + 2); =20 // DELAY =20 @@ -499,7 +491,7 @@ static void ppc6_rd_data_blk(struct pi_adapter *pi, u8 = *data, long count) count--; } =20 - outb(ppc->cur_ctrl, pi->port + 2); + outb(CUR_CTRL, pi->port + 2); =20 break; } @@ -511,10 +503,9 @@ static void ppc6_rd_data_blk(struct pi_adapter *pi, u8= *data, long count) =20 static void ppc6_wait_for_fifo(struct pi_adapter *pi) { - struct ppc_storage *ppc =3D (void *)(pi->private); int i; =20 - if (ppc->ppc_flags & fifo_wait) + if (PPC_FLAGS & fifo_wait) { for(i=3D0; i<20; i++) inb(pi->port + 1); @@ -525,7 +516,6 @@ static void ppc6_wait_for_fifo(struct pi_adapter *pi) =20 static void ppc6_wr_data_blk(struct pi_adapter *pi, u8 *data, long count) { - struct ppc_storage *ppc =3D (void *)(pi->private); switch (mode_map[pi->mode]) { case PPCMODE_UNI_SW : @@ -535,9 +525,9 @@ static void ppc6_wr_data_blk(struct pi_adapter *pi, u8 = *data, long count) { outb(*data++, pi->port); =20 - ppc->cur_ctrl ^=3D data_stb; + CUR_CTRL ^=3D data_stb; =20 - outb(ppc->cur_ctrl, pi->port + 2); + outb(CUR_CTRL, pi->port + 2); } =20 break; @@ -550,9 +540,9 @@ static void ppc6_wr_data_blk(struct pi_adapter *pi, u8 = *data, long count) =20 ppc6_send_cmd(pi, CMD_PREFIX_SET | PREFIX_FASTWR); =20 - ppc->cur_ctrl |=3D port_stb; + CUR_CTRL |=3D port_stb; =20 - outb(ppc->cur_ctrl, pi->port + 2); + outb(CUR_CTRL, pi->port + 2); =20 last =3D *data; =20 @@ -565,9 +555,9 @@ static void ppc6_wr_data_blk(struct pi_adapter *pi, u8 = *data, long count) =20 if (this =3D=3D last) { - ppc->cur_ctrl ^=3D data_stb; + CUR_CTRL ^=3D data_stb; =20 - outb(ppc->cur_ctrl, pi->port + 2); + outb(CUR_CTRL, pi->port + 2); } else { @@ -577,9 +567,9 @@ static void ppc6_wr_data_blk(struct pi_adapter *pi, u8 = *data, long count) } } =20 - ppc->cur_ctrl &=3D ~port_stb; + CUR_CTRL &=3D ~port_stb; =20 - outb(ppc->cur_ctrl, pi->port + 2); + outb(CUR_CTRL, pi->port + 2); =20 ppc6_send_cmd(pi, CMD_PREFIX_RESET | PREFIX_FASTWR); =20 @@ -694,7 +684,6 @@ static void ppc6_wr_extout(struct pi_adapter *pi, u8 re= gdata) =20 static int ppc6_open(struct pi_adapter *pi) { - struct ppc_storage *ppc =3D (void *)(pi->private); int ret; =20 ret =3D ppc6_select(pi); @@ -702,7 +691,7 @@ static int ppc6_open(struct pi_adapter *pi) if (ret =3D=3D 0) return(ret); =20 - ppc->ppc_flags &=3D ~fifo_wait; + PPC_FLAGS &=3D ~fifo_wait; =20 ppc6_send_cmd(pi, ACCESS_REG | ACCESS_WRITE | REG_RAMSIZE); ppc6_wr_data_byte(pi, RAMSIZE_128K); @@ -710,7 +699,7 @@ static int ppc6_open(struct pi_adapter *pi) ppc6_send_cmd(pi, ACCESS_REG | ACCESS_READ | REG_VERSION); =20 if ((ppc6_rd_data_byte(pi) & 0x3F) =3D=3D 0x0C) - ppc->ppc_flags |=3D fifo_wait; + PPC_FLAGS |=3D fifo_wait; =20 return(ret); } --=20 Ondrej Zary