Skip to content

Commit 7c97e46

Browse files
Ondrej ZaryDamien Le Moal
authored andcommitted
ata: pata_parport-bpck6: move ppc6_open to bpck6.c and rename
Move ppc6_open to bpck6.c and rename it to bpck6_open Signed-off-by: Ondrej Zary <linux@zary.sk> Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
1 parent 9e75963 commit 7c97e46

2 files changed

Lines changed: 21 additions & 30 deletions

File tree

drivers/ata/pata_parport/bpck6.c

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,25 @@ static void bpck6_read_block(struct pi_adapter *pi, char *buf, int len)
174174
ppc6_send_cmd(pi, CMD_PREFIX_RESET | PREFIX_IO16 | PREFIX_BLK);
175175
}
176176

177+
static int bpck6_open(struct pi_adapter *pi)
178+
{
179+
int ret = ppc6_select(pi);
180+
181+
if (ret == 0)
182+
return ret;
183+
184+
pi->private = 0;
185+
186+
ppc6_send_cmd(pi, ACCESS_REG | ACCESS_WRITE | REG_RAMSIZE);
187+
ppc6_wr_data_byte(pi, RAMSIZE_128K);
188+
189+
ppc6_send_cmd(pi, ACCESS_REG | ACCESS_READ | REG_VERSION);
190+
if ((ppc6_rd_data_byte(pi) & 0x3F) == 0x0C)
191+
pi->private |= fifo_wait;
192+
193+
return ret;
194+
}
195+
177196
static void bpck6_wr_extout(struct pi_adapter *pi, u8 regdata)
178197
{
179198
ppc6_send_cmd(pi, REG_VERSION | ACCESS_REG | ACCESS_WRITE);
@@ -184,7 +203,7 @@ static void bpck6_connect(struct pi_adapter *pi)
184203
{
185204
dev_dbg(&pi->dev, "connect\n");
186205

187-
ppc6_open(pi);
206+
bpck6_open(pi);
188207
bpck6_wr_extout(pi, 0x3);
189208
}
190209

@@ -218,7 +237,7 @@ static int bpck6_probe_unit(struct pi_adapter *pi)
218237
/*LOWER DOWN TO UNIDIRECTIONAL*/
219238
pi->mode = 0;
220239

221-
out = ppc6_open(pi);
240+
out = bpck6_open(pi);
222241

223242
dev_dbg(&pi->dev, "ppc_open returned %2x\n", out);
224243

drivers/ata/pata_parport/ppc6lnx.c

Lines changed: 0 additions & 28 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 int ppc6_open(struct pi_adapter *pi);
7675

7776
//***************************************************************************
7877

@@ -277,30 +276,3 @@ static u8 ppc6_rd_data_byte(struct pi_adapter *pi)
277276

278277
return(data);
279278
}
280-
281-
//***************************************************************************
282-
283-
static int ppc6_open(struct pi_adapter *pi)
284-
{
285-
int ret;
286-
287-
ret = ppc6_select(pi);
288-
289-
if (ret == 0)
290-
return(ret);
291-
292-
pi->private = 0;
293-
294-
ppc6_send_cmd(pi, ACCESS_REG | ACCESS_WRITE | REG_RAMSIZE);
295-
ppc6_wr_data_byte(pi, RAMSIZE_128K);
296-
297-
ppc6_send_cmd(pi, ACCESS_REG | ACCESS_READ | REG_VERSION);
298-
299-
if ((ppc6_rd_data_byte(pi) & 0x3F) == 0x0C)
300-
pi->private |= fifo_wait;
301-
302-
return(ret);
303-
}
304-
305-
//***************************************************************************
306-

0 commit comments

Comments
 (0)