Commit 82e16f82 authored by Ondrej Zary's avatar Ondrej Zary Committed by Damien Le Moal
Browse files

ata: pata_parport-bpck6: move ppc6_deselect to bpck6.c and rename 



Move ppc6_deselect to bpck6.c and rename it to bpck6_deselect

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

drivers/ata/pata_parport/bpck6.c

+17 −2
Original line number Diff line number Diff line
@@ -235,6 +235,21 @@ static int bpck6_open(struct pi_adapter *pi) 
	return 0; // FAIL

}



static void bpck6_deselect(struct pi_adapter *pi)

{

	if (mode_map[pi->mode] & 4)	// EPP

		parport_frob_control(pi->pardev->port, PARPORT_CONTROL_INIT,

							PARPORT_CONTROL_INIT);

	else								// PPC/ECP

		parport_frob_control(pi->pardev->port, PARPORT_CONTROL_SELECT,

							PARPORT_CONTROL_SELECT);



	parport_write_data(pi->pardev->port, pi->saved_r0);

	parport_write_control(pi->pardev->port,

			pi->saved_r2 | PARPORT_CONTROL_SELECT);

	parport_write_control(pi->pardev->port, pi->saved_r2);

}



static void bpck6_wr_extout(struct pi_adapter *pi, u8 regdata)

{

	ppc6_send_cmd(pi, REG_VERSION | ACCESS_REG | ACCESS_WRITE);
@@ -253,7 +268,7 @@ static void bpck6_disconnect(struct pi_adapter *pi) 
{

	dev_dbg(&pi->dev, "disconnect\n");

	bpck6_wr_extout(pi, 0x0);

	ppc6_deselect(pi);

	bpck6_deselect(pi);

}



static int bpck6_test_port(struct pi_adapter *pi)   /* check for 8-bit port */
@@ -285,7 +300,7 @@ static int bpck6_probe_unit(struct pi_adapter *pi) 


  	if(out)

 	{

		ppc6_deselect(pi);

		bpck6_deselect(pi);

		dev_dbg(&pi->dev, "leaving probe\n");

		pi->mode = saved_mode;

               return(1);

drivers/ata/pata_parport/ppc6lnx.c

+0 −19
Original line number Diff line number Diff line
@@ -67,7 +67,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);
@@ -79,24 +78,6 @@ int mode_map[] = { PPCMODE_UNI_FW, PPCMODE_BI_FW, PPCMODE_EPP_BYTE, 


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



static void ppc6_deselect(struct pi_adapter *pi)

{

	if (mode_map[pi->mode] & 4)	// EPP

		parport_frob_control(pi->pardev->port,

			PARPORT_CONTROL_INIT, PARPORT_CONTROL_INIT);

	else								// PPC/ECP

		parport_frob_control(pi->pardev->port,

			PARPORT_CONTROL_SELECT, PARPORT_CONTROL_SELECT);



	parport_write_data(pi->pardev->port, pi->saved_r0);



	parport_write_control(pi->pardev->port, (pi->saved_r2 | PARPORT_CONTROL_SELECT));



	parport_write_control(pi->pardev->port, pi->saved_r2);

}



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



static void ppc6_send_cmd(struct pi_adapter *pi, u8 cmd)

{

	switch (mode_map[pi->mode])