lkml.org 
[lkml]   [2009]   [Mar]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 33/61] platform: make better use of to_platform_{device,driver}() macros
    Date
    From: Eric Miao <eric.miao@marvell.com>

    This helps the code look more consistent and cleaner.

    Signed-off-by: Eric Miao <eric.miao@marvell.com>
    Cc: Kay Sievers <kay.sievers@vrfy.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    drivers/base/platform.c | 21 +++++++++------------
    drivers/block/floppy.c | 3 +--
    drivers/isdn/gigaset/ser-gigaset.c | 3 +--
    3 files changed, 11 insertions(+), 16 deletions(-)

    diff --git a/drivers/base/platform.c b/drivers/base/platform.c
    index 349a101..62a8768 100644
    --- a/drivers/base/platform.c
    +++ b/drivers/base/platform.c
    @@ -603,9 +603,8 @@ static int platform_uevent(struct device *dev, struct kobj_uevent_env *env)
    */
    static int platform_match(struct device *dev, struct device_driver *drv)
    {
    - struct platform_device *pdev;
    + struct platform_device *pdev = to_platform_device(dev);

    - pdev = container_of(dev, struct platform_device, dev);
    return (strcmp(pdev->name, drv->name) == 0);
    }

    @@ -623,26 +622,24 @@ static int platform_legacy_suspend(struct device *dev, pm_message_t mesg)

    static int platform_legacy_suspend_late(struct device *dev, pm_message_t mesg)
    {
    - struct platform_driver *drv = to_platform_driver(dev->driver);
    - struct platform_device *pdev;
    + struct platform_driver *pdrv = to_platform_driver(dev->driver);
    + struct platform_device *pdev = to_platform_device(dev);
    int ret = 0;

    - pdev = container_of(dev, struct platform_device, dev);
    - if (dev->driver && drv->suspend_late)
    - ret = drv->suspend_late(pdev, mesg);
    + if (dev->driver && pdrv->suspend_late)
    + ret = pdrv->suspend_late(pdev, mesg);

    return ret;
    }

    static int platform_legacy_resume_early(struct device *dev)
    {
    - struct platform_driver *drv = to_platform_driver(dev->driver);
    - struct platform_device *pdev;
    + struct platform_driver *pdrv = to_platform_driver(dev->driver);
    + struct platform_device *pdev = to_platform_device(dev);
    int ret = 0;

    - pdev = container_of(dev, struct platform_device, dev);
    - if (dev->driver && drv->resume_early)
    - ret = drv->resume_early(pdev);
    + if (dev->driver && pdrv->resume_early)
    + ret = pdrv->resume_early(pdev);

    return ret;
    }
    diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
    index 83d8ed3..c2c95e6 100644
    --- a/drivers/block/floppy.c
    +++ b/drivers/block/floppy.c
    @@ -4135,10 +4135,9 @@ static int have_no_fdc = -ENODEV;
    static ssize_t floppy_cmos_show(struct device *dev,
    struct device_attribute *attr, char *buf)
    {
    - struct platform_device *p;
    + struct platform_device *p = to_platform_device(dev);
    int drive;

    - p = container_of(dev, struct platform_device,dev);
    drive = p->id;
    return sprintf(buf, "%X\n", UDP->cmos);
    }
    diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
    index ac245e7..3071a52 100644
    --- a/drivers/isdn/gigaset/ser-gigaset.c
    +++ b/drivers/isdn/gigaset/ser-gigaset.c
    @@ -389,8 +389,7 @@ static void gigaset_freecshw(struct cardstate *cs)

    static void gigaset_device_release(struct device *dev)
    {
    - struct platform_device *pdev =
    - container_of(dev, struct platform_device, dev);
    + struct platform_device *pdev = to_platform_device(dev);

    /* adapted from platform_device_release() in drivers/base/platform.c */
    //FIXME is this actually necessary?
    --
    1.6.2


    \
     
     \ /
      Last update: 2009-03-25 01:55    [W:0.036 / U:1.340 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site