From bd3f84c25a220c4df872d8aeeeacd3b37424be32 Mon Sep 17 00:00:00 2001 From: Michael Ellerman Date: Wed, 10 Jun 2009 19:06:34 +0000 Subject: [PATCH] --- yaml --- r: 151063 b: refs/heads/master c: 86c276560a22915c92cd0b0179556b7f3dac6f7a h: refs/heads/master i: 151061: 860eee3f3b3e0de2006497c375beb2b34dd9d1a9 151059: 0704c9b23021704609e652563c253f5d0c469dcd 151055: c5a9cc43c49ff61b11606f074e4db20c26d23da6 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/cell/axon_msi.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e6354b29b0fe..f5aecbece1ca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e468455e5845f83950d1271a6cd0425b9c7290ab +refs/heads/master: 86c276560a22915c92cd0b0179556b7f3dac6f7a diff --git a/trunk/arch/powerpc/platforms/cell/axon_msi.c b/trunk/arch/powerpc/platforms/cell/axon_msi.c index 0ce45c2b42f8..c71498dbf211 100644 --- a/trunk/arch/powerpc/platforms/cell/axon_msi.c +++ b/trunk/arch/powerpc/platforms/cell/axon_msi.c @@ -329,7 +329,7 @@ static struct irq_host_ops msic_host_ops = { static int axon_msi_shutdown(struct of_device *device) { - struct axon_msic *msic = device->dev.platform_data; + struct axon_msic *msic = dev_get_drvdata(&device->dev); u32 tmp; pr_debug("axon_msi: disabling %s\n", @@ -416,7 +416,7 @@ static int axon_msi_probe(struct of_device *device, msic->read_offset = dcr_read(msic->dcr_host, MSIC_WRITE_OFFSET_REG) & MSIC_FIFO_SIZE_MASK; - device->dev.platform_data = msic; + dev_set_drvdata(&device->dev, msic); ppc_md.setup_msi_irqs = axon_msi_setup_msi_irqs; ppc_md.teardown_msi_irqs = axon_msi_teardown_msi_irqs;