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 /sound/parisc/harmony.c | |
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 'sound/parisc/harmony.c')
-rw-r--r-- | sound/parisc/harmony.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/parisc/harmony.c b/sound/parisc/harmony.c index f560dd8cdb90..8b3ea26469ad 100644 --- a/sound/parisc/harmony.c +++ b/sound/parisc/harmony.c | |||
@@ -852,14 +852,14 @@ snd_harmony_create(snd_card_t *card, | |||
852 | memset(&h->pbuf, 0, sizeof(h->pbuf)); | 852 | memset(&h->pbuf, 0, sizeof(h->pbuf)); |
853 | memset(&h->cbuf, 0, sizeof(h->cbuf)); | 853 | memset(&h->cbuf, 0, sizeof(h->cbuf)); |
854 | 854 | ||
855 | h->hpa = padev->hpa; | 855 | h->hpa = padev->hpa.start; |
856 | h->card = card; | 856 | h->card = card; |
857 | h->dev = padev; | 857 | h->dev = padev; |
858 | h->irq = padev->irq; | 858 | h->irq = padev->irq; |
859 | h->iobase = ioremap_nocache(padev->hpa, HARMONY_SIZE); | 859 | h->iobase = ioremap_nocache(padev->hpa.start, HARMONY_SIZE); |
860 | if (h->iobase == NULL) { | 860 | if (h->iobase == NULL) { |
861 | printk(KERN_ERR PFX "unable to remap hpa 0x%lx\n", | 861 | printk(KERN_ERR PFX "unable to remap hpa 0x%lx\n", |
862 | padev->hpa); | 862 | padev->hpa.start); |
863 | err = -EBUSY; | 863 | err = -EBUSY; |
864 | goto free_and_ret; | 864 | goto free_and_ret; |
865 | } | 865 | } |