rtc: s3c: remove warning message when checking coding style with checkpatch script

Remove warning message when checking codeing style with checkpatch script
and reduce un-necessary i2c read operation on s3c_rtc_enable.

    WARNING: line over 80 characters
    #406: FILE: drivers/rtc/rtc-s3c.c:406:
    +		if ((readw(info->base + S3C2410_RTCCON) & S3C2410_RTCCON_RTCEN) == 0) {

    WARNING: line over 80 characters
    #414: FILE: drivers/rtc/rtc-s3c.c:414:
    +		if ((readw(info->base + S3C2410_RTCCON) & S3C2410_RTCCON_CNTSEL)) {

    WARNING: line over 80 characters
    #422: FILE: drivers/rtc/rtc-s3c.c:422:
    +		if ((readw(info->base + S3C2410_RTCCON) & S3C2410_RTCCON_CLKRST)) {

    WARNING: Missing a blank line after declarations
    #451: FILE: drivers/rtc/rtc-s3c.c:451:
    +	struct s3c_rtc_drv_data *data;
    +	if (pdev->dev.of_node) {

    WARNING: Missing a blank line after declarations
    #453: FILE: drivers/rtc/rtc-s3c.c:453:
    +		const struct of_device_id *match;
    +		match = of_match_node(s3c_rtc_dt_match, pdev->dev.of_node);

    WARNING: DT compatible string "samsung,s3c2416-rtc" appears un-documented -- check ./Documentation/devicetree/bindings/
    #650: FILE: drivers/rtc/rtc-s3c.c:650:
    +		.compatible = "samsung,s3c2416-rtc",

    WARNING: DT compatible string "samsung,s3c2443-rtc" appears un-documented -- check ./Documentation/devicetree/bindings/
    #653: FILE: drivers/rtc/rtc-s3c.c:653:
    +		.compatible = "samsung,s3c2443-rtc",

Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/Documentation/devicetree/bindings/rtc/s3c-rtc.txt b/Documentation/devicetree/bindings/rtc/s3c-rtc.txt
index 7ac7259fe9ea9d61eb208064c364b0998221aa11..06db446ba71cb20d4c690e76b3dbd249b96e3c40 100644 (file)
--- a/Documentation/devicetree/bindings/rtc/s3c-rtc.txt
+++ b/Documentation/devicetree/bindings/rtc/s3c-rtc.txt
@@ -3,6 +3,8 @@
 Required properties:
 - compatible: should be one of the following.
     * "samsung,s3c2410-rtc" - for controllers compatible with s3c2410 rtc.
+    * "samsung,s3c2416-rtc" - for controllers compatible with s3c2416 rtc.
+    * "samsung,s3c2443-rtc" - for controllers compatible with s3c2443 rtc.
     * "samsung,s3c6410-rtc" - for controllers compatible with s3c6410 rtc.
 - reg: physical base address of the controller and length of memory mapped
   region.

diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index 2f71b13c00d6d9185d9df164b6c3346daf0d2432..4e95cca7615ce92abaa1422d010c5590113a6140 100644 (file)
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -382,25 +382,25 @@ static const struct rtc_class_ops s3c_rtcops = {
 
 static void s3c_rtc_enable(struct s3c_rtc *info, int en)
 {
-       unsigned int tmp;
+       unsigned int con, tmp;
 
        clk_enable(info->rtc_clk);
+
+       con = readw(info->base + S3C2410_RTCCON);
        if (!en) {
-               tmp = readw(info->base + S3C2410_RTCCON);
                if (info->cpu_type == TYPE_S3C64XX)
-                       tmp &= ~S3C64XX_RTCCON_TICEN;
-               tmp &= ~S3C2410_RTCCON_RTCEN;
-               writew(tmp, info->base + S3C2410_RTCCON);
+                       con &= ~S3C64XX_RTCCON_TICEN;
+               con &= ~S3C2410_RTCCON_RTCEN;
+               writew(con, info->base + S3C2410_RTCCON);
 
                if (info->cpu_type != TYPE_S3C64XX) {
-                       tmp = readb(info->base + S3C2410_TICNT);
-                       tmp &= ~S3C2410_TICNT_ENABLE;
-                       writeb(tmp, info->base + S3C2410_TICNT);
+                       con = readb(info->base + S3C2410_TICNT);
+                       con &= ~S3C2410_TICNT_ENABLE;
+                       writeb(con, info->base + S3C2410_TICNT);
                }
        } else {
                /* re-enable the device, and check it is ok */
-
-               if ((readw(info->base + S3C2410_RTCCON) & S3C2410_RTCCON_RTCEN) == 0) {
+               if ((con & S3C2410_RTCCON_RTCEN) == 0) {
                        dev_info(info->dev, "rtc disabled, re-enabling\n");
 
                        tmp = readw(info->base + S3C2410_RTCCON);
@@ -408,7 +408,7 @@ static void s3c_rtc_enable(struct s3c_rtc *info, int en)
                                info->base + S3C2410_RTCCON);
                }
 
-               if ((readw(info->base + S3C2410_RTCCON) & S3C2410_RTCCON_CNTSEL)) {
+               if (con & S3C2410_RTCCON_CNTSEL) {
                        dev_info(info->dev, "removing RTCCON_CNTSEL\n");
 
                        tmp = readw(info->base + S3C2410_RTCCON);
@@ -416,7 +416,7 @@ static void s3c_rtc_enable(struct s3c_rtc *info, int en)
                                info->base + S3C2410_RTCCON);
                }
 
-               if ((readw(info->base + S3C2410_RTCCON) & S3C2410_RTCCON_CLKRST)) {
+               if (con & S3C2410_RTCCON_CLKRST) {
                        dev_info(info->dev, "removing RTCCON_CLKRST\n");
 
                        tmp = readw(info->base + S3C2410_RTCCON);
@@ -445,8 +445,10 @@ 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);
                data = (struct s3c_rtc_drv_data *) match->data;
                return data->cpu_type;