Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d18dbfa7 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 3cf62a5a

drivers/parisc/eisa.c

+1 −1
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ static int __init eisa_probe(struct parisc_device *dev) 
	if (result >= 0) {

		/* FIXME : Don't enumerate the bus twice. */

		eisa_dev.root.dev = &dev->dev;

		dev->dev.driver_data = &eisa_dev.root;

		dev_set_drvdata(&dev->dev, &eisa_dev.root);

		eisa_dev.root.bus_base_addr = 0;

		eisa_dev.root.res = &eisa_dev.hba.io_space;

		eisa_dev.root.slots = result;

drivers/parisc/sba_iommu.c

+3 −3
Original line number Diff line number Diff line
@@ -2010,7 +2010,7 @@ void __init sba_init(void) 
void * sba_get_iommu(struct parisc_device *pci_hba)

{

	struct parisc_device *sba_dev = parisc_parent(pci_hba);

	struct sba_device *sba = sba_dev->dev.driver_data;

	struct sba_device *sba = dev_get_drvdata(&sba_dev->dev);

	char t = sba_dev->id.hw_type;

	int iocnum = (pci_hba->hw_path >> 3);	/* rope # */
@@ -2031,7 +2031,7 @@ void * sba_get_iommu(struct parisc_device *pci_hba) 
void sba_directed_lmmio(struct parisc_device *pci_hba, struct resource *r)

{

	struct parisc_device *sba_dev = parisc_parent(pci_hba);

	struct sba_device *sba = sba_dev->dev.driver_data;

	struct sba_device *sba = dev_get_drvdata(&sba_dev->dev);

	char t = sba_dev->id.hw_type;

	int i;

	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) 
void sba_distributed_lmmio(struct parisc_device *pci_hba, struct resource *r )

{

	struct parisc_device *sba_dev = parisc_parent(pci_hba);

	struct sba_device *sba = sba_dev->dev.driver_data;

	struct sba_device *sba = dev_get_drvdata(&sba_dev->dev);

	char t = sba_dev->id.hw_type;

	int base, size;

	int rope = (pci_hba->hw_path & (ROPES_PER_IOC-1));  /* rope # */