Commit 71b3e0c1 authored by Eric Miao's avatar Eric Miao Committed by Greg Kroah-Hartman
Browse files

platform: make better use of to_platform_{device,driver}() macros 



This helps the code look more consistent and cleaner.

Signed-off-by: default avatarEric Miao <eric.miao@marvell.com>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 49b420a1

drivers/base/platform.c

+9 −12
Original line number Diff line number Diff line
@@ -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;

}

drivers/block/floppy.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

}

drivers/isdn/gigaset/ser-gigaset.c

+1 −2
Original line number Diff line number Diff line
@@ -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?