Skip to content

Commit ba98c56

Browse files
Ondrej ZaryDamien Le Moal
authored andcommitted
ata: pata_parport-bpck6: merge ppc6_wr_port into bpck6_write_regr
ppc6_wr_port is only called by bpck6_write_regr. Merge ppc6_wr_port into bpck6_write_regr. Signed-off-by: Ondrej Zary <linux@zary.sk> Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
1 parent 2ee865c commit ba98c56

2 files changed

Lines changed: 4 additions & 11 deletions

File tree

drivers/ata/pata_parport/bpck6.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,10 @@ static int bpck6_read_regr(struct pi_adapter *pi, int cont, int reg)
2929

3030
static void bpck6_write_regr(struct pi_adapter *pi, int cont, int reg, int val)
3131
{
32-
ppc6_wr_port(pi, cont?reg|8:reg, val);
32+
u8 port = cont ? reg | 8 : reg;
33+
34+
ppc6_send_cmd(pi, port | ACCESS_PORT | ACCESS_WRITE);
35+
ppc6_wr_data_byte(pi, val);
3336
}
3437

3538
static void bpck6_write_block(struct pi_adapter *pi, char *buf, int len)

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_port(struct pi_adapter *pi, u8 port, u8 data);
7675
static void ppc6_rd_data_blk(struct pi_adapter *pi, u8 *data, long count);
7776
static void ppc6_wait_for_fifo(struct pi_adapter *pi);
7877
static void ppc6_wr_data_blk(struct pi_adapter *pi, u8 *data, long count);
@@ -287,15 +286,6 @@ static u8 ppc6_rd_data_byte(struct pi_adapter *pi)
287286

288287
//***************************************************************************
289288

290-
static void ppc6_wr_port(struct pi_adapter *pi, u8 port, u8 data)
291-
{
292-
ppc6_send_cmd(pi, port | ACCESS_PORT | ACCESS_WRITE);
293-
294-
ppc6_wr_data_byte(pi, data);
295-
}
296-
297-
//***************************************************************************
298-
299289
static void ppc6_rd_data_blk(struct pi_adapter *pi, u8 *data, long count)
300290
{
301291
switch (mode_map[pi->mode])

0 commit comments

Comments
 (0)