The patch titled
Subject: rtc-s3c-define-s3c_rtc-structure-to-remove-global-variables-v2
has been added to the -mm tree. Its filename is
rtc-s3c-define-s3c_rtc-structure-to-remove-global-variables-v2.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/rtc-s3c-define-s3c_rtc-structure-to-remove-global-variables-v2.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/rtc-s3c-define-s3c_rtc-structure-to-remove-global-variables-v2.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Chanwoo Choi <cw00.choi@xxxxxxxxxxx>
Subject: rtc-s3c-define-s3c_rtc-structure-to-remove-global-variables-v2
Signed-off-by: Chanwoo Choi <cw00.choi@xxxxxxxxxxx>
Acked-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
Cc: Kukjin Kim <kgene.kim@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/rtc/rtc-s3c.c | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff -puN drivers/rtc/rtc-s3c.c~rtc-s3c-define-s3c_rtc-structure-to-remove-global-variables-v2 drivers/rtc/rtc-s3c.c
--- a/drivers/rtc/rtc-s3c.c~rtc-s3c-define-s3c_rtc-structure-to-remove-global-variables-v2
+++ a/drivers/rtc/rtc-s3c.c
@@ -121,6 +121,9 @@ static int s3c_rtc_setaie(struct device
struct s3c_rtc *info = dev_get_drvdata(dev);
unsigned int tmp;
+ if (!info->base)
+ return -EINVAL;
+
dev_dbg(info->dev, "%s: aie=%d\n", __func__, enabled);
clk_enable(info->rtc_clk);
@@ -180,6 +183,9 @@ static int s3c_rtc_gettime(struct device
struct s3c_rtc *info = dev_get_drvdata(dev);
unsigned int have_retried = 0;
+ if (!info->base)
+ return -EINVAL;
+
clk_enable(info->rtc_clk);
retry_get_time:
rtc_tm->tm_min = readb(info->base + S3C2410_RTCMIN);
@@ -224,6 +230,9 @@ static int s3c_rtc_settime(struct device
struct s3c_rtc *info = dev_get_drvdata(dev);
int year = tm->tm_year - 100;
+ if (!info->base)
+ return -EINVAL;
+
dev_dbg(dev, "set time %04d.%02d.%02d %02d:%02d:%02d\n",
1900 + tm->tm_year, tm->tm_mon, tm->tm_mday,
tm->tm_hour, tm->tm_min, tm->tm_sec);
@@ -255,6 +264,9 @@ static int s3c_rtc_getalarm(struct devic
struct rtc_time *alm_tm = &alrm->time;
unsigned int alm_en;
+ if (!info->base)
+ return -EINVAL;
+
clk_enable(info->rtc_clk);
alm_tm->tm_sec = readb(info->base + S3C2410_ALMSEC);
alm_tm->tm_min = readb(info->base + S3C2410_ALMMIN);
@@ -317,6 +329,9 @@ static int s3c_rtc_setalarm(struct devic
struct rtc_time *tm = &alrm->time;
unsigned int alrm_en;
+ if (!info->base)
+ return -EINVAL;
+
clk_enable(info->rtc_clk);
dev_dbg(dev, "s3c_rtc_setalarm: %d, %04d.%02d.%02d %02d:%02d:%02d\n",
alrm->enabled,
@@ -357,6 +372,9 @@ static int s3c_rtc_proc(struct device *d
struct s3c_rtc *info = dev_get_drvdata(dev);
unsigned int ticnt;
+ if (!info->base)
+ return -EINVAL;
+
clk_enable(info->rtc_clk);
if (info->cpu_type == TYPE_S3C64XX) {
ticnt = readw(info->base + S3C2410_RTCCON);
@@ -548,7 +566,7 @@ static int s3c_rtc_probe(struct platform
rtc_tm.tm_min = 0;
rtc_tm.tm_sec = 0;
- s3c_rtc_settime(NULL, &rtc_tm);
+ s3c_rtc_settime(&pdev->dev, &rtc_tm);
dev_warn(&pdev->dev, "warning: invalid RTC value so initializing it\n");
}
_
Patches currently in -mm which might be from cw00.choi@xxxxxxxxxxx are
rtc-s3c-define-s3c_rtc-structure-to-remove-global-variables.patch
rtc-s3c-define-s3c_rtc-structure-to-remove-global-variables-v2.patch
rtc-s3c-remove-warning-message-when-checking-coding-style-with-checkpatch-script.patch
rtc-s3c-add-s3c_rtc_data-structure-to-use-variant-data-instead-of-s3c_cpu_type.patch
rtc-s3c-add-support-for-rtc-of-exynos3250-soc.patch
arm-dts-fix-wrong-compatible-string-of-exynos3250-rtc-dt-node.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
