summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOndrej Zary <linux@zary.sk>2023-03-07 23:46:09 +0100
committerDamien Le Moal <damien.lemoal@opensource.wdc.com>2023-03-23 12:22:19 +0900
commit77c521d79a86593e9f249e2fead7cdbf9ca68189 (patch)
tree8816cc1b7ce1827f18e3af0626ad01e439973a6e
parentf34536f5ecf04f9ce3bc11ecba31f2d24a6b0a8c (diff)
ata: pata_parport-bpck6: remove PPC_FLAGS
pi->private is now not used for any other purpose, so store wait_fifo flag directly there and remove PPC_FLAGS define. Signed-off-by: Ondrej Zary <linux@zary.sk> Reviewed-by: Sergey Shtylyov <s.shtylyov@omp.ru> Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
-rw-r--r--drivers/ata/pata_parport/ppc6lnx.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/ata/pata_parport/ppc6lnx.c b/drivers/ata/pata_parport/ppc6lnx.c
index fdc11875bf1b..9a166f396112 100644
--- a/drivers/ata/pata_parport/ppc6lnx.c
+++ b/drivers/ata/pata_parport/ppc6lnx.c
@@ -49,10 +49,6 @@
//***************************************************************************
-#define PPC_FLAGS (((u8 *)&pi->private)[1])
-
-//***************************************************************************
-
// ppc_flags
#define fifo_wait 0x10
@@ -405,7 +401,7 @@ static void ppc6_wait_for_fifo(struct pi_adapter *pi)
{
int i;
- if (PPC_FLAGS & fifo_wait)
+ if (pi->private & fifo_wait)
{
for(i=0; i<20; i++)
parport_read_status(pi->pardev->port);
@@ -562,7 +558,7 @@ static int ppc6_open(struct pi_adapter *pi)
if (ret == 0)
return(ret);
- PPC_FLAGS &= ~fifo_wait;
+ pi->private = 0;
ppc6_send_cmd(pi, ACCESS_REG | ACCESS_WRITE | REG_RAMSIZE);
ppc6_wr_data_byte(pi, RAMSIZE_128K);
@@ -570,7 +566,7 @@ static int ppc6_open(struct pi_adapter *pi)
ppc6_send_cmd(pi, ACCESS_REG | ACCESS_READ | REG_VERSION);
if ((ppc6_rd_data_byte(pi) & 0x3F) == 0x0C)
- PPC_FLAGS |= fifo_wait;
+ pi->private |= fifo_wait;
return(ret);
}