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/serial | |
parent | bdad1f836ab1ca2b18a625222f63f630cfd14e41 (diff) |
[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/serial')
-rw-r--r-- | drivers/serial/8250_gsc.c | 5 | ||||
-rw-r--r-- | drivers/serial/mux.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/drivers/serial/8250_gsc.c b/drivers/serial/8250_gsc.c index 431aa5761a7a..abc5a0cfe243 100644 --- a/drivers/serial/8250_gsc.c +++ b/drivers/serial/8250_gsc.c | |||
@@ -42,12 +42,13 @@ serial_init_chip(struct parisc_device *dev) | |||
42 | */ | 42 | */ |
43 | if (parisc_parent(dev)->id.hw_type != HPHW_IOA) { | 43 | if (parisc_parent(dev)->id.hw_type != HPHW_IOA) { |
44 | printk(KERN_INFO "Serial: device 0x%lx not configured.\n" | 44 | printk(KERN_INFO "Serial: device 0x%lx not configured.\n" |
45 | "Enable support for Wax, Lasi, Asp or Dino.\n", dev->hpa); | 45 | "Enable support for Wax, Lasi, Asp or Dino.\n", |
46 | dev->hpa.start); | ||
46 | } | 47 | } |
47 | return -ENODEV; | 48 | return -ENODEV; |
48 | } | 49 | } |
49 | 50 | ||
50 | address = dev->hpa; | 51 | address = dev->hpa.start; |
51 | if (dev->id.sversion != 0x8d) { | 52 | if (dev->id.sversion != 0x8d) { |
52 | address += 0x800; | 53 | address += 0x800; |
53 | } | 54 | } |
diff --git a/drivers/serial/mux.c b/drivers/serial/mux.c index a12005b08bca..009ce83c8ef5 100644 --- a/drivers/serial/mux.c +++ b/drivers/serial/mux.c | |||
@@ -444,7 +444,7 @@ static int __init mux_probe(struct parisc_device *dev) | |||
444 | unsigned long bytecnt; | 444 | unsigned long bytecnt; |
445 | struct uart_port *port; | 445 | struct uart_port *port; |
446 | 446 | ||
447 | status = pdc_iodc_read(&bytecnt, dev->hpa, 0, iodc_data, 32); | 447 | status = pdc_iodc_read(&bytecnt, dev->hpa.start, 0, iodc_data, 32); |
448 | if(status != PDC_OK) { | 448 | if(status != PDC_OK) { |
449 | printk(KERN_ERR "Serial mux: Unable to read IODC.\n"); | 449 | printk(KERN_ERR "Serial mux: Unable to read IODC.\n"); |
450 | return 1; | 450 | return 1; |