rtc-s5m-allow-usage-on-device-type-different-than-main-mfd-type-v2

Consistently use platform_get_device_id() instead of pdev->id_entry.

Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/drivers/rtc/rtc-s5m.c b/drivers/rtc/rtc-s5m.c
index 1e52759a0fb7d5cbb16d10b6b6b21375d1715791..8c70d785ba739c314221fb98fe2533e160ee3180 100644 (file)
--- a/drivers/rtc/rtc-s5m.c
+++ b/drivers/rtc/rtc-s5m.c
@@ -688,7 +688,7 @@ static int s5m_rtc_probe(struct platform_device *pdev)
        default:
                dev_err(&pdev->dev,
                                "Device type %lu is not supported by RTC driver\n",
-                               pdev->id_entry->driver_data);
+                               platform_get_device_id(pdev)->driver_data);
                return -ENODEV;
        }
 
@@ -708,7 +708,7 @@ static int s5m_rtc_probe(struct platform_device *pdev)
 
        info->dev = &pdev->dev;
        info->s5m87xx = s5m87xx;
-       info->device_type = pdev->id_entry->driver_data;
+       info->device_type = platform_get_device_id(pdev)->driver_data;
 
        if (s5m87xx->irq_data) {
                info->irq = regmap_irq_get_virq(s5m87xx->irq_data, alarm_irq);