Patchwork [v2] rtc: rtc-ds1390/rtc-ds3234/rtc-m41t94: eliminate compile warning

login
register
mail settings
Submitter Dennis Aberilla
Date May 18, 2011, 5 a.m.
Message ID <204176.97974.qm@web120507.mail.ne1.yahoo.com>
Download mbox | patch
Permalink /patch/96122/
State New
Headers show

Comments

Dennis Aberilla - May 18, 2011, 5 a.m.
From: Axel Lin <axel.lin@gmail.com>

These drivers are registered as spi drivers,
thus use spi_get_drvdata instead of platform_get_drvdata.

This patch eliminates the following compile warning:
drivers/rtc/rtc-ds1390.c: In function 'ds1390_remove':
drivers/rtc/rtc-ds1390.c:161: warning: passing argument 1 of 'platform_get_drvdata' from incompatible pointer type
drivers/rtc/rtc-ds3234.c: In function 'ds3234_remove':
drivers/rtc/rtc-ds3234.c:161: warning: passing argument 1 of 'platform_get_drvdata' from incompatible pointer type
drivers/rtc/rtc-m41t94.c: In function 'm41t94_remove':
drivers/rtc/rtc-m41t94.c:139: warning: passing argument 1 of 'platform_get_drvdata' from incompatible pointer type

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off by: Dennis Aberilla <denzzzhome@yahoo.com>
Cc: Mark Jackson <mpfj@mimc.co.uk>
Cc: Kim B. Heino <Kim.Heino@bluegiga.com>

---
 drivers/rtc/rtc-ds1390.c |    2 +-
 drivers/rtc/rtc-ds3234.c |    2 +-
 drivers/rtc/rtc-m41t94.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
Axel Lin - May 18, 2011, 5:05 a.m.
hi Dennis,

2011/5/18 Dennis Aberilla <denzzzhome@yahoo.com>:
> From: Axel Lin <axel.lin@gmail.com>
>
> These drivers are registered as spi drivers,
> thus use spi_get_drvdata instead of platform_get_drvdata.
>
> This patch eliminates the following compile warning:
> drivers/rtc/rtc-ds1390.c: In function 'ds1390_remove':
> drivers/rtc/rtc-ds1390.c:161: warning: passing argument 1 of 'platform_get_drvdata' from incompatible pointer type
> drivers/rtc/rtc-ds3234.c: In function 'ds3234_remove':
> drivers/rtc/rtc-ds3234.c:161: warning: passing argument 1 of 'platform_get_drvdata' from incompatible pointer type
> drivers/rtc/rtc-m41t94.c: In function 'm41t94_remove':
> drivers/rtc/rtc-m41t94.c:139: warning: passing argument 1 of 'platform_get_drvdata' from incompatible pointer type
>
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> Signed-off by: Dennis Aberilla <denzzzhome@yahoo.com>
> Cc: Mark Jackson <mpfj@mimc.co.uk>
> Cc: Kim B. Heino <Kim.Heino@bluegiga.com>
>

Just FYI.
A similar patch "spi/rtc-{ds1390,ds3234,m41t94}: Use spi_get_drvdata()
for SPI devices"
from Geert Uytterhoeven is already merged to linux-next.

Regards,
Axel

Patch

diff --git a/drivers/rtc/rtc-ds1390.c b/drivers/rtc/rtc-ds1390.c
index 26a86d2..b038d2c 100644
--- a/drivers/rtc/rtc-ds1390.c
+++ b/drivers/rtc/rtc-ds1390.c
@@ -158,7 +158,7 @@  static int __devinit ds1390_probe(struct spi_device *spi)
 
 static int __devexit ds1390_remove(struct spi_device *spi)
 {
-    struct ds1390 *chip = platform_get_drvdata(spi);
+    struct ds1390 *chip = spi_get_drvdata(spi);
 
     rtc_device_unregister(chip->rtc);
     kfree(chip);
diff --git a/drivers/rtc/rtc-ds3234.c b/drivers/rtc/rtc-ds3234.c
index a774ca3..bbd2622 100644
--- a/drivers/rtc/rtc-ds3234.c
+++ b/drivers/rtc/rtc-ds3234.c
@@ -158,7 +158,7 @@  static int __devinit ds3234_probe(struct spi_device *spi)
 
 static int __devexit ds3234_remove(struct spi_device *spi)
 {
-    struct rtc_device *rtc = platform_get_drvdata(spi);
+    struct rtc_device *rtc = spi_get_drvdata(spi);
 
     rtc_device_unregister(rtc);
     return 0;
diff --git a/drivers/rtc/rtc-m41t94.c b/drivers/rtc/rtc-m41t94.c
index c8c97a4..e259ed7 100644
--- a/drivers/rtc/rtc-m41t94.c
+++ b/drivers/rtc/rtc-m41t94.c
@@ -136,7 +136,7 @@  static int __devinit m41t94_probe(struct spi_device *spi)
 
 static int __devexit m41t94_remove(struct spi_device *spi)
 {
-    struct rtc_device *rtc = platform_get_drvdata(spi);
+    struct rtc_device *rtc = spi_get_drvdata(spi);
 
     if (rtc)
         rtc_device_unregister(rtc);