summaryrefslogtreecommitdiffstats
path: root/drivers/parport/parport_gsc.c
diff options
context:
space:
mode:
authorMatthew Wilcox2005-10-22 04:36:40 +0200
committerKyle McMartin2005-10-22 04:36:40 +0200
commit53f01bba49938f115237fe43a261c31ac13ae5c6 (patch)
treedf2a5fa9d95c7e69447ac0c89d6e149888c9bd1c /drivers/parport/parport_gsc.c
parent[PARISC] Change the driver names so /sys/bus/parisc/drivers/ looks better (diff)
downloadkernel-qcow2-linux-53f01bba49938f115237fe43a261c31ac13ae5c6.tar.gz
kernel-qcow2-linux-53f01bba49938f115237fe43a261c31ac13ae5c6.tar.xz
kernel-qcow2-linux-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/parport/parport_gsc.c')
-rw-r--r--drivers/parport/parport_gsc.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/parport/parport_gsc.c b/drivers/parport/parport_gsc.c
index 02d72acd1c89..fde29a75f888 100644
--- a/drivers/parport/parport_gsc.c
+++ b/drivers/parport/parport_gsc.c
@@ -359,11 +359,12 @@ static int __devinit parport_init_chip(struct parisc_device *dev)
unsigned long port;
if (!dev->irq) {
- printk("IRQ not found for parallel device at 0x%lx\n", dev->hpa);
+ printk(KERN_WARNING "IRQ not found for parallel device at 0x%lx\n",
+ dev->hpa.start);
return -ENODEV;
}
- port = dev->hpa + PARPORT_GSC_OFFSET;
+ port = dev->hpa.start + PARPORT_GSC_OFFSET;
/* some older machines with ASP-chip don't support
* the enhanced parport modes.