diff options
| author | Ondrej Zary <linux@zary.sk> | 2023-03-07 23:46:01 +0100 |
|---|---|---|
| committer | Damien Le Moal <damien.lemoal@opensource.wdc.com> | 2023-03-23 12:21:05 +0900 |
| commit | 997b0ce28ad30fd97f3924ddaa88208babf95f05 (patch) | |
| tree | 19e737ed301e9c0e906b9b98a95bf698077c75ce /drivers/ata | |
| parent | 617aecc2b3e75ef1d3deedbd1869bb83f1a2778f (diff) | |
| download | linux-stable-997b0ce28ad30fd97f3924ddaa88208babf95f05.tar.gz linux-stable-997b0ce28ad30fd97f3924ddaa88208babf95f05.tar.bz2 linux-stable-997b0ce28ad30fd97f3924ddaa88208babf95f05.zip | |
ata: pata_parport-bpck6: remove ppc_id from struct ppc_storage
ppc_id duplicates pi->unit. Remove it.
Signed-off-by: Ondrej Zary <linux@zary.sk>
Reviewed-by: Sergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/pata_parport/bpck6.c | 7 | ||||
| -rw-r--r-- | drivers/ata/pata_parport/ppc6lnx.c | 5 |
2 files changed, 2 insertions, 10 deletions
diff --git a/drivers/ata/pata_parport/bpck6.c b/drivers/ata/pata_parport/bpck6.c index 50d313fc529e..176bf456c698 100644 --- a/drivers/ata/pata_parport/bpck6.c +++ b/drivers/ata/pata_parport/bpck6.c @@ -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; diff --git a/drivers/ata/pata_parport/ppc6lnx.c b/drivers/ata/pata_parport/ppc6lnx.c index c00e561cc833..dd9f3040f9a7 100644 --- a/drivers/ata/pata_parport/ppc6lnx.c +++ b/drivers/ata/pata_parport/ppc6lnx.c @@ -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; |