lkml.org 
[lkml]   [2011]   [Feb]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 15/29] janz: mfd_cell is now implicitly available to drivers (v2)
    Date
    The cell's platform_data is now accessed with a helper function;
    change clients to use that, and remove the now-unused data_size.

    v2: add some missing mfd/core.h includes.

    Signed-off-by: Andres Salomon <dilinger@queued.net>
    ---
    drivers/gpio/janz-ttl.c | 3 ++-
    drivers/mfd/janz-cmodio.c | 1 -
    drivers/net/can/janz-ican3.c | 3 ++-
    3 files changed, 4 insertions(+), 3 deletions(-)

    diff --git a/drivers/gpio/janz-ttl.c b/drivers/gpio/janz-ttl.c
    index 813ac07..2514fb0 100644
    --- a/drivers/gpio/janz-ttl.c
    +++ b/drivers/gpio/janz-ttl.c
    @@ -15,6 +15,7 @@
    #include <linux/interrupt.h>
    #include <linux/delay.h>
    #include <linux/platform_device.h>
    +#include <linux/mfd/core.h>
    #include <linux/io.h>
    #include <linux/gpio.h>
    #include <linux/slab.h>
    @@ -149,7 +150,7 @@ static int __devinit ttl_probe(struct platform_device *pdev)
    struct resource *res;
    int ret;

    - pdata = pdev->dev.platform_data;
    + pdata = mfd_get_data(pdev);
    if (!pdata) {
    dev_err(dev, "no platform data\n");
    ret = -ENXIO;
    diff --git a/drivers/mfd/janz-cmodio.c b/drivers/mfd/janz-cmodio.c
    index 36a166b..58de1e2 100644
    --- a/drivers/mfd/janz-cmodio.c
    +++ b/drivers/mfd/janz-cmodio.c
    @@ -87,7 +87,6 @@ static int __devinit cmodio_setup_subdevice(struct cmodio_device *priv,
    /* Add platform data */
    pdata->modno = modno;
    cell->platform_data = pdata;
    - cell->data_size = sizeof(*pdata);

    /* MODULbus registers -- PCI BAR3 is big-endian MODULbus access */
    res->flags = IORESOURCE_MEM;
    diff --git a/drivers/net/can/janz-ican3.c b/drivers/net/can/janz-ican3.c
    index 366f5cc..102b16c 100644
    --- a/drivers/net/can/janz-ican3.c
    +++ b/drivers/net/can/janz-ican3.c
    @@ -15,6 +15,7 @@
    #include <linux/interrupt.h>
    #include <linux/delay.h>
    #include <linux/platform_device.h>
    +#include <linux/mfd/core.h>

    #include <linux/netdevice.h>
    #include <linux/can.h>
    @@ -1643,7 +1644,7 @@ static int __devinit ican3_probe(struct platform_device *pdev)
    struct device *dev;
    int ret;

    - pdata = pdev->dev.platform_data;
    + pdata = mfd_get_data(pdev);
    if (!pdata)
    return -ENXIO;

    --
    1.7.2.3


    \
     
     \ /
      Last update: 2011-02-18 04:15    [W:0.021 / U:0.724 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site