Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c8a6046e authored by Sachin Kamat's avatar Sachin Kamat Committed by Linus Torvalds
Browse files

drivers/rtc: use of_match_ptr() macro 



This eliminates having an #ifdef returning NULL for the case when OF is
disabled.  Maintains consistency in cases where OF is always selected.

Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f32bc70d

drivers/rtc/rtc-cmos.c

+1 −2
Original line number Diff line number Diff line
@@ -1098,7 +1098,6 @@ static __init void cmos_of_init(struct platform_device *pdev) 
}

#else

static inline void cmos_of_init(struct platform_device *pdev) {}

#define of_cmos_match NULL

#endif

/*----------------------------------------------------------------*/
@@ -1140,7 +1139,7 @@ static struct platform_driver cmos_platform_driver = { 
#ifdef CONFIG_PM

		.pm		= &cmos_pm_ops,

#endif

		.of_match_table = of_cmos_match,

		.of_match_table = of_match_ptr(of_cmos_match),

	}

};

drivers/rtc/rtc-mpc5121.c

+4 −1
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/init.h>

#include <linux/module.h>

#include <linux/rtc.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/of_platform.h>

#include <linux/io.h>
@@ -403,17 +404,19 @@ static int mpc5121_rtc_remove(struct platform_device *op) 
	return 0;

}



#ifdef CONFIG_OF

static struct of_device_id mpc5121_rtc_match[] = {

	{ .compatible = "fsl,mpc5121-rtc", },

	{ .compatible = "fsl,mpc5200-rtc", },

	{},

};

#endif



static struct platform_driver mpc5121_rtc_driver = {

	.driver = {

		.name = "mpc5121-rtc",

		.owner = THIS_MODULE,

		.of_match_table = mpc5121_rtc_match,

		.of_match_table = of_match_ptr(mpc5121_rtc_match),

	},

	.probe = mpc5121_rtc_probe,

	.remove = mpc5121_rtc_remove,

drivers/rtc/rtc-sa1100.c

+3 −1
Original line number Diff line number Diff line
@@ -349,12 +349,14 @@ static const struct dev_pm_ops sa1100_rtc_pm_ops = { 
};

#endif



#ifdef CONFIG_OF

static struct of_device_id sa1100_rtc_dt_ids[] = {

	{ .compatible = "mrvl,sa1100-rtc", },

	{ .compatible = "mrvl,mmp-rtc", },

	{}

};

MODULE_DEVICE_TABLE(of, sa1100_rtc_dt_ids);

#endif



static struct platform_driver sa1100_rtc_driver = {

	.probe		= sa1100_rtc_probe,
@@ -364,7 +366,7 @@ static struct platform_driver sa1100_rtc_driver = { 
#ifdef CONFIG_PM

		.pm	= &sa1100_rtc_pm_ops,

#endif

		.of_match_table = sa1100_rtc_dt_ids,

		.of_match_table = of_match_ptr(sa1100_rtc_dt_ids),

	},

};

drivers/rtc/rtc-snvs.c

+1 −1
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ static struct platform_driver snvs_rtc_driver = { 
		.name	= "snvs_rtc",

		.owner	= THIS_MODULE,

		.pm	= &snvs_rtc_pm_ops,

		.of_match_table = snvs_dt_ids,

		.of_match_table = of_match_ptr(snvs_dt_ids),

	},

	.probe		= snvs_rtc_probe,

	.remove		= snvs_rtc_remove,

drivers/rtc/rtc-stmp3xxx.c

+2 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <linux/rtc.h>

#include <linux/slab.h>

#include <linux/of_device.h>

#include <linux/of.h>



#include <mach/common.h>
@@ -280,7 +281,7 @@ static struct platform_driver stmp3xxx_rtcdrv = { 
	.driver		= {

		.name	= "stmp3xxx-rtc",

		.owner	= THIS_MODULE,

		.of_match_table = rtc_dt_ids,

		.of_match_table = of_match_ptr(rtc_dt_ids),

	},

};