Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 71b3e0c1ad90f28e34c105069175cbd4edb43dfa

Authored by Eric Miao
Committed by Greg Kroah-Hartman
1 parent 49b420a13f
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

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

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>

Showing 3 changed files with 11 additions and 16 deletions Side-by-side Diff

drivers/base/platform.c
Diff comments   View file @ 71b3e0c
... ... @@ -603,9 +603,8 @@
603 603 */
604 604 static int platform_match(struct device *dev, struct device_driver *drv)
605 605 {
606   - struct platform_device *pdev;
  606 + struct platform_device *pdev = to_platform_device(dev);
607 607  
608   - pdev = container_of(dev, struct platform_device, dev);
609 608 return (strcmp(pdev->name, drv->name) == 0);
610 609 }
611 610  
612 611  
613 612  
614 613  
... ... @@ -623,26 +622,24 @@
623 622  
624 623 static int platform_legacy_suspend_late(struct device *dev, pm_message_t mesg)
625 624 {
626   - struct platform_driver *drv = to_platform_driver(dev->driver);
627   - struct platform_device *pdev;
  625 + struct platform_driver *pdrv = to_platform_driver(dev->driver);
  626 + struct platform_device *pdev = to_platform_device(dev);
628 627 int ret = 0;
629 628  
630   - pdev = container_of(dev, struct platform_device, dev);
631   - if (dev->driver && drv->suspend_late)
632   - ret = drv->suspend_late(pdev, mesg);
  629 + if (dev->driver && pdrv->suspend_late)
  630 + ret = pdrv->suspend_late(pdev, mesg);
633 631  
634 632 return ret;
635 633 }
636 634  
637 635 static int platform_legacy_resume_early(struct device *dev)
638 636 {
639   - struct platform_driver *drv = to_platform_driver(dev->driver);
640   - struct platform_device *pdev;
  637 + struct platform_driver *pdrv = to_platform_driver(dev->driver);
  638 + struct platform_device *pdev = to_platform_device(dev);
641 639 int ret = 0;
642 640  
643   - pdev = container_of(dev, struct platform_device, dev);
644   - if (dev->driver && drv->resume_early)
645   - ret = drv->resume_early(pdev);
  641 + if (dev->driver && pdrv->resume_early)
  642 + ret = pdrv->resume_early(pdev);
646 643  
647 644 return ret;
648 645 }
drivers/block/floppy.c
Diff comments   View file @ 71b3e0c
... ... @@ -4135,10 +4135,9 @@
4135 4135 static ssize_t floppy_cmos_show(struct device *dev,
4136 4136 struct device_attribute *attr, char *buf)
4137 4137 {
4138   - struct platform_device *p;
  4138 + struct platform_device *p = to_platform_device(dev);
4139 4139 int drive;
4140 4140  
4141   - p = container_of(dev, struct platform_device,dev);
4142 4141 drive = p->id;
4143 4142 return sprintf(buf, "%X\n", UDP->cmos);
4144 4143 }
drivers/isdn/gigaset/ser-gigaset.c
Diff comments   View file @ 71b3e0c
... ... @@ -389,8 +389,7 @@
389 389  
390 390 static void gigaset_device_release(struct device *dev)
391 391 {
392   - struct platform_device *pdev =
393   - container_of(dev, struct platform_device, dev);
  392 + struct platform_device *pdev = to_platform_device(dev);
394 393  
395 394 /* adapted from platform_device_release() in drivers/base/platform.c */
396 395 //FIXME is this actually necessary?