diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-05-04 15:40:54 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-06-16 00:30:28 -0400 |
commit | d18dbfa7aaa8d50c2c1c66359f0ab6b085dfa03f (patch) | |
tree | ef464da590822f8dcf9aa673b4c3a02a88ff1a1b /drivers/parisc/sba_iommu.c | |
parent | 3cf62a5a82f9819896d72b20f8c55e0858c7aec8 (diff) |
parisc: remove driver_data direct access of struct device
In the near future, the driver core is going to not allow direct access
to the driver_data pointer in struct device. Instead, the functions
dev_get_drvdata() and dev_set_drvdata() should be used. These functions
have been around since the beginning, so are backwards compatible with
all older kernel versions.
Cc: linux-parisc@vger.kernel.org
Cc: Helge Deller <deller@gmx.de>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
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 # */ |