Skip to content

Commit 9e75963

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

2 files changed

Lines changed: 8 additions & 12 deletions

File tree

drivers/ata/pata_parport/bpck6.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,18 +174,24 @@ 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 void bpck6_wr_extout(struct pi_adapter *pi, u8 regdata)
178+
{
179+
ppc6_send_cmd(pi, REG_VERSION | ACCESS_REG | ACCESS_WRITE);
180+
ppc6_wr_data_byte(pi, (u8)((regdata & 0x03) << 6));
181+
}
182+
177183
static void bpck6_connect(struct pi_adapter *pi)
178184
{
179185
dev_dbg(&pi->dev, "connect\n");
180186

181187
ppc6_open(pi);
182-
ppc6_wr_extout(pi, 0x3);
188+
bpck6_wr_extout(pi, 0x3);
183189
}
184190

185191
static void bpck6_disconnect(struct pi_adapter *pi)
186192
{
187193
dev_dbg(&pi->dev, "disconnect\n");
188-
ppc6_wr_extout(pi, 0x0);
194+
bpck6_wr_extout(pi, 0x0);
189195
ppc6_deselect(pi);
190196
}
191197

drivers/ata/pata_parport/ppc6lnx.c

Lines changed: 0 additions & 10 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_wr_extout(struct pi_adapter *pi, u8 regdata);
7675
static int ppc6_open(struct pi_adapter *pi);
7776

7877
//***************************************************************************
@@ -281,15 +280,6 @@ static u8 ppc6_rd_data_byte(struct pi_adapter *pi)
281280

282281
//***************************************************************************
283282

284-
static void ppc6_wr_extout(struct pi_adapter *pi, u8 regdata)
285-
{
286-
ppc6_send_cmd(pi, REG_VERSION | ACCESS_REG | ACCESS_WRITE);
287-
288-
ppc6_wr_data_byte(pi, (u8)((regdata & 0x03) << 6));
289-
}
290-
291-
//***************************************************************************
292-
293283
static int ppc6_open(struct pi_adapter *pi)
294284
{
295285
int ret;

0 commit comments

Comments
 (0)