Re: [PATCH 0/2] Fixes related to rtc-s3c

[Tushar Behera <tushar.behera@linaro.org>]

On 03/28/2012 04:58 PM, Heiko Stübner wrote:
> Am Mittwoch, 28. März 2012, 12:50:35 schrieb Tushar Behera:
>> The patches are based on Kukjin's for-next branch and they fix a couple
>> of compile-time errors and warnings.
> There was also a fixup patch for these problems posted on 2012-01-04. But it seems
> to have been forgotten somehow.
> 
> I think either solution is fine.
> 
> 
> Heiko
> 
I must have missed this patch too. We can go ahead with Heiko's patch.

> 
> For reference the original patch was:
> 
> ---- 8< ----------------------------------- >8 ----
> Subject: [PATCH] rtc-s3c: Fix breakage introduced by S3C2443/S3C2416 support
> 
> Commits 7006ee4f (rtc-s3c: make room for more variants in devicetree block)
> and 6c0a2365 (rtc-s3c: add variants for S3C2443 and S3C2416)
> introduced build-failures with enabled CONFIG_USE_OF option.
> 
> This patch fixes missing "," in s3c_rtc_dt_match and wrong handling of
> the of_device_id.data property.
> 
> Reported-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
> ---
>  drivers/rtc/rtc-s3c.c |   18 +++++++++---------
>  1 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
> index bb0f320..2b4feb8 100644
> --- a/drivers/rtc/rtc-s3c.c
> +++ b/drivers/rtc/rtc-s3c.c
> @@ -449,7 +449,7 @@ static inline int s3c_rtc_get_driver_data(struct platform_device *pdev)
>         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;
> +               return (int)match->data;
>         }
>  #endif
>         return platform_get_device_id(pdev)->driver_data;
> @@ -667,17 +667,17 @@ static int s3c_rtc_resume(struct platform_device *pdev)
>  #ifdef CONFIG_OF
>  static const struct of_device_id s3c_rtc_dt_match[] = {
>         {
> -               .compatible = "samsung,s3c2410-rtc"
> -               .data = TYPE_S3C2410,
> +               .compatible = "samsung,s3c2410-rtc",
> +               .data = (void *)TYPE_S3C2410,
>         }, {
> -               .compatible = "samsung,s3c2416-rtc"
> -               .data = TYPE_S3C2416,
> +               .compatible = "samsung,s3c2416-rtc",
> +               .data = (void *)TYPE_S3C2416,
>         }, {
> -               .compatible = "samsung,s3c2443-rtc"
> -               .data = TYPE_S3C2443,
> +               .compatible = "samsung,s3c2443-rtc",
> +               .data = (void *)TYPE_S3C2443,
>         }, {
> -               .compatible = "samsung,s3c6410-rtc"
> -               .data = TYPE_S3C64XX,
> +               .compatible = "samsung,s3c6410-rtc",
> +               .data = (void *)TYPE_S3C64XX,
>         },
>         {},
>  };


-- 
Tushar Behera