Commit 997b0ce2 authored by Ondrej Zary's avatar Ondrej Zary Committed by Damien Le Moal
Browse files

ata: pata_parport-bpck6: remove ppc_id from struct ppc_storage 



ppc_id duplicates pi->unit. Remove it.

Signed-off-by: default avatarOndrej Zary <linux@zary.sk>
Reviewed-by: default avatarSergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
parent 617aecc2

drivers/ata/pata_parport/bpck6.c

+0 −7
Original line number Diff line number Diff line
@@ -72,13 +72,9 @@ static void bpck6_disconnect(struct pi_adapter *pi) 


static int bpck6_test_port(struct pi_adapter *pi)   /* check for 8-bit port */

{

	struct ppc_storage *ppc = (void *)(pi->private);

	dev_dbg(&pi->dev, "PARPORT indicates modes=%x for lp=0x%lx\n",

		pi->pardev->port->modes, pi->pardev->port->base);



	/*copy over duplicate stuff.. initialize state info*/

	ppc->ppc_id = pi->unit;



	/* look at the parport device to see what modes we can use */

	if (pi->pardev->port->modes & PARPORT_MODE_EPP)

		return 5; /* Can do EPP */
@@ -94,9 +90,6 @@ static int bpck6_probe_unit(struct pi_adapter *pi) 


	dev_dbg(&pi->dev, "PROBE UNIT %x on port:%x\n", pi->unit, pi->port);



	/*SET PPC UNIT NUMBER*/

	ppc->ppc_id = pi->unit;



	/*LOWER DOWN TO UNIDIRECTIONAL*/

	ppc->mode = 1;

drivers/ata/pata_parport/ppc6lnx.c

+2 −3
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ 
//***************************************************************************



struct ppc_storage {

	u8	ppc_id;

	u8	mode;						// operating mode

					// 0 = PPC Uni SW

					// 1 = PPC Uni FW
@@ -143,8 +142,8 @@ static int ppc6_select(struct pi_adapter *pi) 


	outb('b', pi->port);

	outb('p', pi->port);

	outb(ppc->ppc_id, pi->port);

	outb(~ppc->ppc_id, pi->port);

	outb(pi->unit, pi->port);

	outb(~pi->unit, pi->port);



	ppc->cur_ctrl &= ~port_sel;