summaryrefslogtreecommitdiffstats
path: root/drivers/ata/pata_parport/bpck6.c
diff options
context:
space:
mode:
authorOndrej Zary <linux@zary.sk>2023-03-07 23:46:11 +0100
committerDamien Le Moal <damien.lemoal@opensource.wdc.com>2023-03-23 04:22:19 +0100
commit2ee865ce041c15750745c60d4402defcfafcb412 (patch)
tree56c6a62d6c1c1b6f228a5f00b7467e6c702a93bb /drivers/ata/pata_parport/bpck6.c
parentata: pata_parport-bpck6: remove ppc6_close (diff)
downloadlinux-2ee865ce041c15750745c60d4402defcfafcb412.tar.xz
linux-2ee865ce041c15750745c60d4402defcfafcb412.zip
ata: pata_parport-bpck6: merge ppc6_rd_port into bpck6_read_regr
ppc6_rd_port is only called by bpck6_read_regr. Merge ppc6_rd_port into bpck6_read_regr. Signed-off-by: Ondrej Zary <linux@zary.sk> Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Diffstat (limited to 'drivers/ata/pata_parport/bpck6.c')
-rw-r--r--drivers/ata/pata_parport/bpck6.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/ata/pata_parport/bpck6.c b/drivers/ata/pata_parport/bpck6.c
index b8135a6eed16..2918fc9e9def 100644
--- a/drivers/ata/pata_parport/bpck6.c
+++ b/drivers/ata/pata_parport/bpck6.c
@@ -21,7 +21,10 @@
static int bpck6_read_regr(struct pi_adapter *pi, int cont, int reg)
{
- return ppc6_rd_port(pi, cont?reg|8:reg);
+ u8 port = cont ? reg | 8 : reg;
+
+ ppc6_send_cmd(pi, port | ACCESS_PORT | ACCESS_READ);
+ return ppc6_rd_data_byte(pi);
}
static void bpck6_write_regr(struct pi_adapter *pi, int cont, int reg, int val)