Commit 62972285 authored by Ondrej Zary's avatar Ondrej Zary Committed by Damien Le Moal

ata: pata_parport-bpck6: don't cast pi->pardev to struct pardevice *

pi->pardev is struct pardevice *, no need to cast it to the same type.
Also clean up the return mess.
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 84d890fc
...@@ -74,30 +74,18 @@ static void bpck6_disconnect(struct pi_adapter *pi) ...@@ -74,30 +74,18 @@ static void bpck6_disconnect(struct pi_adapter *pi)
static int bpck6_test_port(struct pi_adapter *pi) /* check for 8-bit port */ static int bpck6_test_port(struct pi_adapter *pi) /* check for 8-bit port */
{ {
dev_dbg(&pi->dev, "PARPORT indicates modes=%x for lp=0x%lx\n", dev_dbg(&pi->dev, "PARPORT indicates modes=%x for lp=0x%lx\n",
((struct pardevice *)(pi->pardev))->port->modes, pi->pardev->port->modes, pi->pardev->port->base);
((struct pardevice *)(pi->pardev))->port->base);
/*copy over duplicate stuff.. initialize state info*/ /*copy over duplicate stuff.. initialize state info*/
PPCSTRUCT(pi)->ppc_id=pi->unit; PPCSTRUCT(pi)->ppc_id=pi->unit;
PPCSTRUCT(pi)->lpt_addr=pi->port; PPCSTRUCT(pi)->lpt_addr=pi->port;
/* look at the parport device to see if what modes we can use */ /* look at the parport device to see what modes we can use */
if(((struct pardevice *)(pi->pardev))->port->modes & if (pi->pardev->port->modes & PARPORT_MODE_EPP)
(PARPORT_MODE_EPP) return 5; /* Can do EPP */
) if (pi->pardev->port->modes & PARPORT_MODE_TRISTATE)
{
return 5; /* Can do EPP*/
}
else if(((struct pardevice *)(pi->pardev))->port->modes &
(PARPORT_MODE_TRISTATE)
)
{
return 2; return 2;
} return 1; /* Just flat SPP */
else /*Just flat SPP*/
{
return 1;
}
} }
static int bpck6_probe_unit(struct pi_adapter *pi) static int bpck6_probe_unit(struct pi_adapter *pi)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment