Commit 2ee865ce authored by Ondrej Zary's avatar Ondrej Zary Committed by Damien Le Moal
Browse files

ata: pata_parport-bpck6: merge ppc6_rd_port into bpck6_read_regr 



ppc6_rd_port is only called by bpck6_read_regr. Merge ppc6_rd_port
into bpck6_read_regr.

Signed-off-by: default avatarOndrej Zary <linux@zary.sk>
Signed-off-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
parent cd3b3944

drivers/ata/pata_parport/bpck6.c

+4 −1
Original line number Diff line number Diff line
@@ -21,7 +21,10 @@ 


static int bpck6_read_regr(struct pi_adapter *pi, int cont, int reg)

{

	return ppc6_rd_port(pi, cont?reg|8:reg);

	u8 port = cont ? reg | 8 : reg;



	ppc6_send_cmd(pi, port | ACCESS_PORT | ACCESS_READ);

	return ppc6_rd_data_byte(pi);

}



static void bpck6_write_regr(struct pi_adapter *pi, int cont, int reg, int val)

drivers/ata/pata_parport/ppc6lnx.c

+0 −10
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ static void ppc6_deselect(struct pi_adapter *pi); 
static void ppc6_send_cmd(struct pi_adapter *pi, u8 cmd);

static void ppc6_wr_data_byte(struct pi_adapter *pi, u8 data);

static u8 ppc6_rd_data_byte(struct pi_adapter *pi);

static u8 ppc6_rd_port(struct pi_adapter *pi, u8 port);

static void ppc6_wr_port(struct pi_adapter *pi, u8 port, u8 data);

static void ppc6_rd_data_blk(struct pi_adapter *pi, u8 *data, long count);

static void ppc6_wait_for_fifo(struct pi_adapter *pi);
@@ -288,15 +287,6 @@ static u8 ppc6_rd_data_byte(struct pi_adapter *pi) 


//***************************************************************************



static u8 ppc6_rd_port(struct pi_adapter *pi, u8 port)

{

	ppc6_send_cmd(pi, port | ACCESS_PORT | ACCESS_READ);



	return ppc6_rd_data_byte(pi);

}



//***************************************************************************



static void ppc6_wr_port(struct pi_adapter *pi, u8 port, u8 data)

{

	ppc6_send_cmd(pi, port | ACCESS_PORT | ACCESS_WRITE);