The patch titled
Subject: rtc-s5m-allow-usage-on-device-type-different-than-main-mfd-type-v2
has been removed from the -mm tree. Its filename was
rtc-s5m-allow-usage-on-device-type-different-than-main-mfd-type-v2.patch
This patch was dropped because it was folded into rtc-s5m-allow-usage-on-device-type-different-than-main-mfd-type.patch
------------------------------------------------------
From: Krzysztof Kozlowski <k.kozlowski@xxxxxxxxxxx>
Subject: 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@xxxxxxxxxxx>
Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
Cc: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
Cc: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx>
Cc: Chanwoo Choi <cw00.choi@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/rtc/rtc-s5m.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN drivers/rtc/rtc-s5m.c~rtc-s5m-allow-usage-on-device-type-different-than-main-mfd-type-v2 drivers/rtc/rtc-s5m.c
--- a/drivers/rtc/rtc-s5m.c~rtc-s5m-allow-usage-on-device-type-different-than-main-mfd-type-v2
+++ a/drivers/rtc/rtc-s5m.c
@@ -688,7 +688,7 @@ static int s5m_rtc_probe(struct platform
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
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);
_
Patches currently in -mm which might be from k.kozlowski@xxxxxxxxxxx are
origin.patch
rtc-rtc-ab-b5ze-s3-constify-struct-regmap_config.patch
rtc-s5m-add-support-for-s2mps13-rtc.patch
rtc-rtc-s3c-fix-failed-first-read-of-rtc-time.patch
rtc-rtc-s3c-remove-one-superfluous-rtc_valid_tm-check.patch
rtc-use-more-standard-kernel-logging-styles.patch
rtc-s5m-allow-usage-on-device-type-different-than-main-mfd-type.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
