diff options
| author |   Matthew Wilcox <willy@parisc-linux.org> | 2005-10-21 22:36:40 -0400 |
|---|---|---|
| committer |   Kyle McMartin <kyle@parisc-linux.org> | 2005-10-21 22:36:40 -0400 |
| commit | 53f01bba49938f115237fe43a261c31ac13ae5c6 (patch) | |
| tree | df2a5fa9d95c7e69447ac0c89d6e149888c9bd1c /drivers/input/serio | |
| parent | [PARISC] Change the driver names so /sys/bus/parisc/drivers/ looks better (diff) | |
| download | linux-dev-53f01bba49938f115237fe43a261c31ac13ae5c6.tar.xz linux-dev-53f01bba49938f115237fe43a261c31ac13ae5c6.zip | |
[PARISC] Convert parisc_device to use struct resource for hpa
Convert pa_dev->hpa from an unsigned long to a struct resource.
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Fix up users of ->hpa to use ->hpa.start instead.
Signed-off-by: Matthew Wilcox <willy@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Diffstat (limited to 'drivers/input/serio')
| -rw-r--r-- | drivers/input/serio/gscps2.c | 2 | ||||
| -rw-r--r-- | drivers/input/serio/hp_sdc.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/serio/gscps2.c b/drivers/input/serio/gscps2.c index 4bad2810190c..9790d7169a53 100644 --- a/drivers/input/serio/gscps2.c +++ b/drivers/input/serio/gscps2.c @@ -331,7 +331,7 @@ static int __init gscps2_probe(struct parisc_device *dev) { struct gscps2port *ps2port; struct serio *serio; - unsigned long hpa = dev->hpa; + unsigned long hpa = dev->hpa.start; int ret; if (!dev->irq) diff --git a/drivers/input/serio/hp_sdc.c b/drivers/input/serio/hp_sdc.c index 045b9a7a9dbb..a10348bb25e9 100644 --- a/drivers/input/serio/hp_sdc.c +++ b/drivers/input/serio/hp_sdc.c @@ -875,9 +875,9 @@ static int __init hp_sdc_init_hppa(struct parisc_device *d) hp_sdc.dev = d; hp_sdc.irq = d->irq; hp_sdc.nmi = d->aux_irq; - hp_sdc.base_io = d->hpa; - hp_sdc.data_io = d->hpa + 0x800; - hp_sdc.status_io = d->hpa + 0x801; + hp_sdc.base_io = d->hpa.start; + hp_sdc.data_io = d->hpa.start + 0x800; + hp_sdc.status_io = d->hpa.start + 0x801; return hp_sdc_init(); } |