Skip to content

Commit 144e779

Browse files
Ondrej ZaryDamien Le Moal
authored andcommitted
ata: pata_parport-bpck6: move ppc6_wait_for_fifo to bpck6.c and rename
Move ppc6_wait_for_fifo to bpck6.c and rename it to bpck6_wait_for_fifo Signed-off-by: Ondrej Zary <linux@zary.sk> Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
1 parent 99c40a7 commit 144e779

2 files changed

Lines changed: 13 additions & 17 deletions

File tree

drivers/ata/pata_parport/bpck6.c

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,16 @@ static void bpck6_write_regr(struct pi_adapter *pi, int cont, int reg, int val)
3535
ppc6_wr_data_byte(pi, val);
3636
}
3737

38+
static void bpck6_wait_for_fifo(struct pi_adapter *pi)
39+
{
40+
int i;
41+
42+
if (pi->private & fifo_wait) {
43+
for (i = 0; i < 20; i++)
44+
parport_read_status(pi->pardev->port);
45+
}
46+
}
47+
3848
static void bpck6_write_block(struct pi_adapter *pi, char *buf, int len)
3949
{
4050
u8 this, last;
@@ -87,17 +97,17 @@ static void bpck6_write_block(struct pi_adapter *pi, char *buf, int len)
8797
case PPCMODE_EPP_BYTE:
8898
pi->pardev->port->ops->epp_write_data(pi->pardev->port, buf,
8999
len, PARPORT_EPP_FAST_8);
90-
ppc6_wait_for_fifo(pi);
100+
bpck6_wait_for_fifo(pi);
91101
break;
92102
case PPCMODE_EPP_WORD:
93103
pi->pardev->port->ops->epp_write_data(pi->pardev->port, buf,
94104
len, PARPORT_EPP_FAST_16);
95-
ppc6_wait_for_fifo(pi);
105+
bpck6_wait_for_fifo(pi);
96106
break;
97107
case PPCMODE_EPP_DWORD:
98108
pi->pardev->port->ops->epp_write_data(pi->pardev->port, buf,
99109
len, PARPORT_EPP_FAST_32);
100-
ppc6_wait_for_fifo(pi);
110+
bpck6_wait_for_fifo(pi);
101111
break;
102112
}
103113

drivers/ata/pata_parport/ppc6lnx.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ static void ppc6_deselect(struct pi_adapter *pi);
7272
static void ppc6_send_cmd(struct pi_adapter *pi, u8 cmd);
7373
static void ppc6_wr_data_byte(struct pi_adapter *pi, u8 data);
7474
static u8 ppc6_rd_data_byte(struct pi_adapter *pi);
75-
static void ppc6_wait_for_fifo(struct pi_adapter *pi);
7675
static void ppc6_wr_extout(struct pi_adapter *pi, u8 regdata);
7776
static int ppc6_open(struct pi_adapter *pi);
7877

@@ -282,19 +281,6 @@ static u8 ppc6_rd_data_byte(struct pi_adapter *pi)
282281

283282
//***************************************************************************
284283

285-
static void ppc6_wait_for_fifo(struct pi_adapter *pi)
286-
{
287-
int i;
288-
289-
if (pi->private & fifo_wait)
290-
{
291-
for(i=0; i<20; i++)
292-
parport_read_status(pi->pardev->port);
293-
}
294-
}
295-
296-
//***************************************************************************
297-
298284
static void ppc6_wr_extout(struct pi_adapter *pi, u8 regdata)
299285
{
300286
ppc6_send_cmd(pi, REG_VERSION | ACCESS_REG | ACCESS_WRITE);

0 commit comments

Comments
 (0)