diff options
-rw-r--r-- | drivers/parisc/eisa.c | 2 | ||||
-rw-r--r-- | drivers/parisc/sba_iommu.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/parisc/eisa.c b/drivers/parisc/eisa.c index f415fdd9a885..5b89f404e668 100644 --- a/drivers/parisc/eisa.c +++ b/drivers/parisc/eisa.c | |||
@@ -373,7 +373,7 @@ static int __init eisa_probe(struct parisc_device *dev) | |||
373 | if (result >= 0) { | 373 | if (result >= 0) { |
374 | /* FIXME : Don't enumerate the bus twice. */ | 374 | /* FIXME : Don't enumerate the bus twice. */ |
375 | eisa_dev.root.dev = &dev->dev; | 375 | eisa_dev.root.dev = &dev->dev; |
376 | dev->dev.driver_data = &eisa_dev.root; | 376 | dev_set_drvdata(&dev->dev, &eisa_dev.root); |
377 | eisa_dev.root.bus_base_addr = 0; | 377 | eisa_dev.root.bus_base_addr = 0; |
378 | eisa_dev.root.res = &eisa_dev.hba.io_space; | 378 | eisa_dev.root.res = &eisa_dev.hba.io_space; |
379 | eisa_dev.root.slots = result; | 379 | eisa_dev.root.slots = result; |
diff --git a/drivers/parisc/sba_iommu.c b/drivers/parisc/sba_iommu.c index e5999c4cedc8..d46dd57450ac 100644 --- a/drivers/parisc/sba_iommu.c +++ b/drivers/parisc/sba_iommu.c | |||
@@ -2010,7 +2010,7 @@ void __init sba_init(void) | |||
2010 | void * sba_get_iommu(struct parisc_device *pci_hba) | 2010 | void * sba_get_iommu(struct parisc_device *pci_hba) |
2011 | { | 2011 | { |
2012 | struct parisc_device *sba_dev = parisc_parent(pci_hba); | 2012 | struct parisc_device *sba_dev = parisc_parent(pci_hba); |
2013 | struct sba_device *sba = sba_dev->dev.driver_data; | 2013 | struct sba_device *sba = dev_get_drvdata(&sba_dev->dev); |
2014 | char t = sba_dev->id.hw_type; | 2014 | char t = sba_dev->id.hw_type; |
2015 | int iocnum = (pci_hba->hw_path >> 3); /* rope # */ | 2015 | int iocnum = (pci_hba->hw_path >> 3); /* rope # */ |
2016 | 2016 | ||
@@ -2031,7 +2031,7 @@ void * sba_get_iommu(struct parisc_device *pci_hba) | |||
2031 | void sba_directed_lmmio(struct parisc_device *pci_hba, struct resource *r) | 2031 | void sba_directed_lmmio(struct parisc_device *pci_hba, struct resource *r) |
2032 | { | 2032 | { |
2033 | struct parisc_device *sba_dev = parisc_parent(pci_hba); | 2033 | struct parisc_device *sba_dev = parisc_parent(pci_hba); |
2034 | struct sba_device *sba = sba_dev->dev.driver_data; | 2034 | struct sba_device *sba = dev_get_drvdata(&sba_dev->dev); |
2035 | char t = sba_dev->id.hw_type; | 2035 | char t = sba_dev->id.hw_type; |
2036 | int i; | 2036 | int i; |
2037 | int rope = (pci_hba->hw_path & (ROPES_PER_IOC-1)); /* rope # */ | 2037 | int rope = (pci_hba->hw_path & (ROPES_PER_IOC-1)); /* rope # */ |
@@ -2073,7 +2073,7 @@ void sba_directed_lmmio(struct parisc_device *pci_hba, struct resource *r) | |||
2073 | void sba_distributed_lmmio(struct parisc_device *pci_hba, struct resource *r ) | 2073 | void sba_distributed_lmmio(struct parisc_device *pci_hba, struct resource *r ) |
2074 | { | 2074 | { |
2075 | struct parisc_device *sba_dev = parisc_parent(pci_hba); | 2075 | struct parisc_device *sba_dev = parisc_parent(pci_hba); |
2076 | struct sba_device *sba = sba_dev->dev.driver_data; | 2076 | struct sba_device *sba = dev_get_drvdata(&sba_dev->dev); |
2077 | char t = sba_dev->id.hw_type; | 2077 | char t = sba_dev->id.hw_type; |
2078 | int base, size; | 2078 | int base, size; |
2079 | int rope = (pci_hba->hw_path & (ROPES_PER_IOC-1)); /* rope # */ | 2079 | int rope = (pci_hba->hw_path & (ROPES_PER_IOC-1)); /* rope # */ |