diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 15:57:37 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 15:57:37 -0400 |
commit | 6fd03301d76bc439382710e449f58efbb233df1b (patch) | |
tree | 3c8a3217aed67319683ffc1debccdb5b3245b16c /drivers/parisc/sba_iommu.c | |
parent | cd5232bd6be2d215a800f3d88c287ca791debfbe (diff) | |
parent | e4792aa30f9d33584d7192685ed149cc5fee737f (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (64 commits)
debugfs: use specified mode to possibly mark files read/write only
debugfs: Fix terminology inconsistency of dir name to mount debugfs filesystem.
xen: remove driver_data direct access of struct device from more drivers
usb: gadget: at91_udc: remove driver_data direct access of struct device
uml: remove driver_data direct access of struct device
block/ps3: remove driver_data direct access of struct device
s390: remove driver_data direct access of struct device
parport: remove driver_data direct access of struct device
parisc: remove driver_data direct access of struct device
of_serial: remove driver_data direct access of struct device
mips: remove driver_data direct access of struct device
ipmi: remove driver_data direct access of struct device
infiniband: ehca: remove driver_data direct access of struct device
ibmvscsi: gadget: at91_udc: remove driver_data direct access of struct device
hvcs: remove driver_data direct access of struct device
xen block: remove driver_data direct access of struct device
thermal: remove driver_data direct access of struct device
scsi: remove driver_data direct access of struct device
pcmcia: remove driver_data direct access of struct device
PCIE: remove driver_data direct access of struct device
...
Manually fix up trivial conflicts due to different direct driver_data
direct access fixups in drivers/block/{ps3disk.c,ps3vram.c}
Diffstat (limited to 'drivers/parisc/sba_iommu.c')
-rw-r--r-- | drivers/parisc/sba_iommu.c | 6 |
1 files changed, 3 insertions, 3 deletions
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 # */ |