rtc: Use dev_get_drvdata()

Using dev_get_drvdata directly.

Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: linux-rtc@vger.kernel.org
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

diff --git a/drivers/rtc/rtc-hid-sensor-time.c b/drivers/rtc/rtc-hid-sensor-time.c
index 3e1abb4554721c496f2c16532e9ed12590946f1b..f27c40e8331f9e868198a96c33d613a7b55a03f2 100644 (file)
--- a/drivers/rtc/rtc-hid-sensor-time.c
+++ b/drivers/rtc/rtc-hid-sensor-time.c
@@ -205,8 +205,7 @@ static int hid_time_parse_report(struct platform_device *pdev,
 static int hid_rtc_read_time(struct device *dev, struct rtc_time *tm)
 {
        unsigned long flags;
-       struct hid_time_state *time_state =
-               platform_get_drvdata(to_platform_device(dev));
+       struct hid_time_state *time_state = dev_get_drvdata(dev);
        int ret;
 
        reinit_completion(&time_state->comp_last_time);

diff --git a/drivers/rtc/rtc-pxa.c b/drivers/rtc/rtc-pxa.c
index e1887b86fdc743ecd7a66edbb5d4b90b7a96625e..d4766734e40b4564fe61da2908af2aa6970c9158 100644 (file)
--- a/drivers/rtc/rtc-pxa.c
+++ b/drivers/rtc/rtc-pxa.c
@@ -145,8 +145,7 @@ static void rtsr_set_bits(struct pxa_rtc *pxa_rtc, u32 mask)
 
 static irqreturn_t pxa_rtc_irq(int irq, void *dev_id)
 {
-       struct platform_device *pdev = to_platform_device(dev_id);
-       struct pxa_rtc *pxa_rtc = platform_get_drvdata(pdev);
+       struct pxa_rtc *pxa_rtc = dev_get_drvdata(dev_id);
        u32 rtsr;
        unsigned long events = 0;
 

diff --git a/drivers/rtc/rtc-rk808.c b/drivers/rtc/rtc-rk808.c
index 1fb864d4ef83cb67c8728b8dbcb97ceab0022f7a..5c5d9f125669b609a4689f952213d37ee852ae12 100644 (file)
--- a/drivers/rtc/rtc-rk808.c
+++ b/drivers/rtc/rtc-rk808.c
@@ -336,8 +336,7 @@ static const struct rtc_class_ops rk808_rtc_ops = {
 /* Turn off the alarm if it should not be a wake source. */
 static int rk808_rtc_suspend(struct device *dev)
 {
-       struct platform_device *pdev = to_platform_device(dev);
-       struct rk808_rtc *rk808_rtc = dev_get_drvdata(&pdev->dev);
+       struct rk808_rtc *rk808_rtc = dev_get_drvdata(dev);
 
        if (device_may_wakeup(dev))
                enable_irq_wake(rk808_rtc->irq);
@@ -350,8 +349,7 @@ static int rk808_rtc_suspend(struct device *dev)
  */
 static int rk808_rtc_resume(struct device *dev)
 {
-       struct platform_device *pdev = to_platform_device(dev);
-       struct rk808_rtc *rk808_rtc = dev_get_drvdata(&pdev->dev);
+       struct rk808_rtc *rk808_rtc = dev_get_drvdata(dev);
 
        if (device_may_wakeup(dev))
                disable_irq_wake(rk808_rtc->irq);

diff --git a/drivers/rtc/rtc-tx4939.c b/drivers/rtc/rtc-tx4939.c
index 2d24babc4057fbea1357d57810470f97ffcbba97..5a29915a06ecad64f6477a02b02c8d3af487f544 100644 (file)
--- a/drivers/rtc/rtc-tx4939.c
+++ b/drivers/rtc/rtc-tx4939.c
@@ -42,11 +42,6 @@ struct tx4939rtc_plat_data {
        spinlock_t lock;
 };
 
-static struct tx4939rtc_plat_data *get_tx4939rtc_plat_data(struct device *dev)
-{
-       return platform_get_drvdata(to_platform_device(dev));
-}
-
 static int tx4939_rtc_cmd(struct tx4939_rtc_reg __iomem *rtcreg, int cmd)
 {
        int i = 0;
@@ -64,7 +59,7 @@ static int tx4939_rtc_cmd(struct tx4939_rtc_reg __iomem *rtcreg, int cmd)
 
 static int tx4939_rtc_set_time(struct device *dev, struct rtc_time *tm)
 {
-       struct tx4939rtc_plat_data *pdata = get_tx4939rtc_plat_data(dev);
+       struct tx4939rtc_plat_data *pdata = dev_get_drvdata(dev);
        struct tx4939_rtc_reg __iomem *rtcreg = pdata->rtcreg;
        unsigned long secs = rtc_tm_to_time64(tm);
        int i, ret;
@@ -89,7 +84,7 @@ static int tx4939_rtc_set_time(struct device *dev, struct rtc_time *tm)
 
 static int tx4939_rtc_read_time(struct device *dev, struct rtc_time *tm)
 {
-       struct tx4939rtc_plat_data *pdata = get_tx4939rtc_plat_data(dev);
+       struct tx4939rtc_plat_data *pdata = dev_get_drvdata(dev);
        struct tx4939_rtc_reg __iomem *rtcreg = pdata->rtcreg;
        int i, ret;
        unsigned long sec;
@@ -115,7 +110,7 @@ static int tx4939_rtc_read_time(struct device *dev, struct rtc_time *tm)
 
 static int tx4939_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
 {
-       struct tx4939rtc_plat_data *pdata = get_tx4939rtc_plat_data(dev);
+       struct tx4939rtc_plat_data *pdata = dev_get_drvdata(dev);
        struct tx4939_rtc_reg __iomem *rtcreg = pdata->rtcreg;
        int i, ret;
        unsigned long sec;
@@ -140,7 +135,7 @@ static int tx4939_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
 
 static int tx4939_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
 {
-       struct tx4939rtc_plat_data *pdata = get_tx4939rtc_plat_data(dev);
+       struct tx4939rtc_plat_data *pdata = dev_get_drvdata(dev);
        struct tx4939_rtc_reg __iomem *rtcreg = pdata->rtcreg;
        int i, ret;
        unsigned long sec;
@@ -170,7 +165,7 @@ static int tx4939_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
 
 static int tx4939_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
 {
-       struct tx4939rtc_plat_data *pdata = get_tx4939rtc_plat_data(dev);
+       struct tx4939rtc_plat_data *pdata = dev_get_drvdata(dev);
 
        spin_lock_irq(&pdata->lock);
        tx4939_rtc_cmd(pdata->rtcreg,
@@ -182,7 +177,7 @@ static int tx4939_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled)
 
 static irqreturn_t tx4939_rtc_interrupt(int irq, void *dev_id)
 {
-       struct tx4939rtc_plat_data *pdata = get_tx4939rtc_plat_data(dev_id);
+       struct tx4939rtc_plat_data *pdata = dev_get_drvdata(dev_id);
        struct tx4939_rtc_reg __iomem *rtcreg = pdata->rtcreg;
        unsigned long events = RTC_IRQF;
 

diff --git a/drivers/rtc/rtc-wm831x.c b/drivers/rtc/rtc-wm831x.c
index ed29f4df2a3c60209b4b2f2fd0d580d249531057..d2e8b21c90c40e7e76e93cbd59521add4811a307 100644 (file)
--- a/drivers/rtc/rtc-wm831x.c
+++ b/drivers/rtc/rtc-wm831x.c
@@ -346,11 +346,10 @@ static const struct rtc_class_ops wm831x_rtc_ops = {
 /* Turn off the alarm if it should not be a wake source. */
 static int wm831x_rtc_suspend(struct device *dev)
 {
-       struct platform_device *pdev = to_platform_device(dev);
-       struct wm831x_rtc *wm831x_rtc = dev_get_drvdata(&pdev->dev);
+       struct wm831x_rtc *wm831x_rtc = dev_get_drvdata(dev);
        int ret, enable;
 
-       if (wm831x_rtc->alarm_enabled && device_may_wakeup(&pdev->dev))
+       if (wm831x_rtc->alarm_enabled && device_may_wakeup(dev))
                enable = WM831X_RTC_ALM_ENA;
        else
                enable = 0;
@@ -358,7 +357,7 @@ static int wm831x_rtc_suspend(struct device *dev)
        ret = wm831x_set_bits(wm831x_rtc->wm831x, WM831X_RTC_CONTROL,
                              WM831X_RTC_ALM_ENA, enable);
        if (ret != 0)
-               dev_err(&pdev->dev, "Failed to update RTC alarm: %d\n", ret);
+               dev_err(dev, "Failed to update RTC alarm: %d\n", ret);
 
        return 0;
 }
@@ -368,15 +367,13 @@ static int wm831x_rtc_suspend(struct device *dev)
  */
 static int wm831x_rtc_resume(struct device *dev)
 {
-       struct platform_device *pdev = to_platform_device(dev);
-       struct wm831x_rtc *wm831x_rtc = dev_get_drvdata(&pdev->dev);
+       struct wm831x_rtc *wm831x_rtc = dev_get_drvdata(dev);
        int ret;
 
        if (wm831x_rtc->alarm_enabled) {
                ret = wm831x_rtc_start_alarm(wm831x_rtc);
                if (ret != 0)
-                       dev_err(&pdev->dev,
-                               "Failed to restart RTC alarm: %d\n", ret);
+                       dev_err(dev, "Failed to restart RTC alarm: %d\n", ret);
        }
 
        return 0;
@@ -385,14 +382,13 @@ static int wm831x_rtc_resume(struct device *dev)
 /* Unconditionally disable the alarm */
 static int wm831x_rtc_freeze(struct device *dev)
 {
-       struct platform_device *pdev = to_platform_device(dev);
-       struct wm831x_rtc *wm831x_rtc = dev_get_drvdata(&pdev->dev);
+       struct wm831x_rtc *wm831x_rtc = dev_get_drvdata(dev);
        int ret;
 
        ret = wm831x_set_bits(wm831x_rtc->wm831x, WM831X_RTC_CONTROL,
                              WM831X_RTC_ALM_ENA, 0);
        if (ret != 0)
-               dev_err(&pdev->dev, "Failed to stop RTC alarm: %d\n", ret);
+               dev_err(dev, "Failed to stop RTC alarm: %d\n", ret);
 
        return 0;
 }

diff --git a/drivers/rtc/rtc-wm8350.c b/drivers/rtc/rtc-wm8350.c
index 483c7993516bb1f3326f54bb595b5144de6c694b..f54fa12c4b4b7ed6eb27daf41e669dd03005921f 100644 (file)
--- a/drivers/rtc/rtc-wm8350.c
+++ b/drivers/rtc/rtc-wm8350.c
@@ -340,8 +340,7 @@ static const struct rtc_class_ops wm8350_rtc_ops = {
 #ifdef CONFIG_PM_SLEEP
 static int wm8350_rtc_suspend(struct device *dev)
 {
-       struct platform_device *pdev = to_platform_device(dev);
-       struct wm8350 *wm8350 = dev_get_drvdata(&pdev->dev);
+       struct wm8350 *wm8350 = dev_get_drvdata(dev);
        int ret = 0;
        u16 reg;
 
@@ -351,8 +350,7 @@ static int wm8350_rtc_suspend(struct device *dev)
            reg & WM8350_RTC_ALMSTS) {
                ret = wm8350_rtc_stop_alarm(wm8350);
                if (ret != 0)
-                       dev_err(&pdev->dev, "Failed to stop RTC alarm: %d\n",
-                               ret);
+                       dev_err(dev, "Failed to stop RTC alarm: %d\n", ret);
        }
 
        return ret;
@@ -360,15 +358,13 @@ static int wm8350_rtc_suspend(struct device *dev)
 
 static int wm8350_rtc_resume(struct device *dev)
 {
-       struct platform_device *pdev = to_platform_device(dev);
-       struct wm8350 *wm8350 = dev_get_drvdata(&pdev->dev);
+       struct wm8350 *wm8350 = dev_get_drvdata(dev);
        int ret;
 
        if (wm8350->rtc.alarm_enabled) {
                ret = wm8350_rtc_start_alarm(wm8350);
                if (ret != 0)
-                       dev_err(&pdev->dev,
-                               "Failed to restart RTC alarm: %d\n", ret);
+                       dev_err(dev, "Failed to restart RTC alarm: %d\n", ret);
        }
 
        return 0;