drivers/rtc/rtc-s3c.c: add placeholder for driver private data (c3cba928) · Commits · 戴 / test

Driver data field is a pointer, hence assigning that to an integer results in compilation warnings. Fixes following compilation warnings: drivers/rtc/rtc-s3c.c: In function `s3c_rtc_get_driver_data': drivers/rtc/rtc-s3c.c:452:3: warning: return makes integer from pointer without a cast [enabled by default] drivers/rtc/rtc-s3c.c: At top level: drivers/rtc/rtc-s3c.c:674:3: warning: initialization makes pointer from integer without a cast [enabled by default] drivers/rtc/rtc-s3c.c:674:3: warning: (near initialization for `s3c_rtc_dt_match[1].data') [enabled by default] drivers/rtc/rtc-s3c.c:677:3: warning: initialization makes pointer from integer without a cast [enabled by default] drivers/rtc/rtc-s3c.c:677:3: warning: (near initialization for `s3c_rtc_dt_match[2].data') [enabled by default] drivers/rtc/rtc-s3c.c:680:3: warning: initialization makes pointer from integer without a cast [enabled by default] drivers/rtc/rtc-s3c.c:680:3: warning: (near initialization for `s3c_rtc_dt_match[3].data') [enabled by default] Signed-off-by:

Tushar Behera <tushar.behera@linaro.org> Cc: Heiko Stuebner <heiko@sntech.de> Cc: Alessandro Zummo <a.zummo@towertech.it> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

drivers/rtc/rtc-s3c.c

+18 −5

Original line number	Diff line number	Diff line
		@@ -40,6 +40,10 @@ enum s3c_cpu_type {
		TYPE_S3C64XX,
		};

		struct s3c_rtc_drv_data {
		int cpu_type;
		};

		/* I have yet to find an S3C implementation with more than one
		* of these rtc blocks in */

		@@ -446,10 +450,12 @@ static const struct of_device_id s3c_rtc_dt_match[];
		static inline int s3c_rtc_get_driver_data(struct platform_device *pdev)
		{
		#ifdef CONFIG_OF
		struct s3c_rtc_drv_data *data;
		if (pdev->dev.of_node) {
		const struct of_device_id *match;
		match = of_match_node(s3c_rtc_dt_match, pdev->dev.of_node);
		return match->data;
		data = (struct s3c_rtc_drv_data *) match->data;
		return data->cpu_type;
		}
		#endif
		return platform_get_device_id(pdev)->driver_data;
		@@ -664,20 +670,27 @@ static int s3c_rtc_resume(struct platform_device *pdev)
		#define s3c_rtc_resume NULL
		#endif

		static struct s3c_rtc_drv_data s3c_rtc_drv_data_array[] = {
		[TYPE_S3C2410] = { TYPE_S3C2410 },
		[TYPE_S3C2416] = { TYPE_S3C2416 },
		[TYPE_S3C2443] = { TYPE_S3C2443 },
		[TYPE_S3C64XX] = { TYPE_S3C64XX },
		};

		#ifdef CONFIG_OF
		static const struct of_device_id s3c_rtc_dt_match[] = {
		{
		.compatible = "samsung,s3c2410-rtc",
		.data = TYPE_S3C2410,
		.data = &s3c_rtc_drv_data_array[TYPE_S3C2410],
		}, {
		.compatible = "samsung,s3c2416-rtc",
		.data = TYPE_S3C2416,
		.data = &s3c_rtc_drv_data_array[TYPE_S3C2416],
		}, {
		.compatible = "samsung,s3c2443-rtc",
		.data = TYPE_S3C2443,
		.data = &s3c_rtc_drv_data_array[TYPE_S3C2443],
		}, {
		.compatible = "samsung,s3c6410-rtc",
		.data = TYPE_S3C64XX,
		.data = &s3c_rtc_drv_data_array[TYPE_S3C64XX],
		},
		{},
		};

Admin message