diff options
author | Milton Miller <miltonm@bga.com> | 2011-05-10 15:30:07 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-05-19 01:31:43 -0400 |
commit | 6c4c82e20a1b476589c1e2b0b7c2adc783c93006 (patch) | |
tree | e8faaf34f32012ff0b671fea624c9ca117d28188 /arch/powerpc | |
parent | 7ee342bdc3d7e2cba4be6d1eece56efec9d3809f (diff) |
powerpc/fsl_msi: Don't abuse platform_data for driver_data
The msi platform device driver was abusing dev.platform_data for its
platform_driver_data. Use the correct pointer for storage.
Platform_data is supposed to be for platforms to communicate to drivers
parameters that are not otherwise discoverable. Its lifetime matches
the platform_device not the platform device driver. It is generally
not needed for drivers that only support systems with device trees.
Signed-off-by: Milton Miller <miltonm@bga.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/sysdev/fsl_msi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c index d5679dc1e20f..077776c06cd0 100644 --- a/arch/powerpc/sysdev/fsl_msi.c +++ b/arch/powerpc/sysdev/fsl_msi.c | |||
@@ -253,7 +253,7 @@ unlock: | |||
253 | 253 | ||
254 | static int fsl_of_msi_remove(struct platform_device *ofdev) | 254 | static int fsl_of_msi_remove(struct platform_device *ofdev) |
255 | { | 255 | { |
256 | struct fsl_msi *msi = ofdev->dev.platform_data; | 256 | struct fsl_msi *msi = platform_get_drvdata(ofdev); |
257 | int virq, i; | 257 | int virq, i; |
258 | struct fsl_msi_cascade_data *cascade_data; | 258 | struct fsl_msi_cascade_data *cascade_data; |
259 | 259 | ||
@@ -327,7 +327,7 @@ static int __devinit fsl_of_msi_probe(struct platform_device *dev) | |||
327 | dev_err(&dev->dev, "No memory for MSI structure\n"); | 327 | dev_err(&dev->dev, "No memory for MSI structure\n"); |
328 | return -ENOMEM; | 328 | return -ENOMEM; |
329 | } | 329 | } |
330 | dev->dev.platform_data = msi; | 330 | platform_set_drvdata(dev, msi); |
331 | 331 | ||
332 | msi->irqhost = irq_alloc_host(dev->dev.of_node, IRQ_HOST_MAP_LINEAR, | 332 | msi->irqhost = irq_alloc_host(dev->dev.of_node, IRQ_HOST_MAP_LINEAR, |
333 | NR_MSI_IRQS, &fsl_msi_host_ops, 0); | 333 | NR_MSI_IRQS, &fsl_msi_host_ops, 0); |