From 9fa2cc097b192df62fa1de4d51c5a3ce924fe8bc Mon Sep 17 00:00:00 2001 From: Venu Byravarasu Date: Thu, 4 Oct 2012 17:14:34 -0700 Subject: [PATCH] --- yaml --- r: 330127 b: refs/heads/master c: 06f77d18e4be0837868ebba8dff4097103e484c4 h: refs/heads/master i: 330125: aec464eab7102c7be0258f691d9e3e5d971b6c05 330123: b15f1244418498bcb95201f1abe5a3a04e799464 330119: 9ac4cdc4f55b566c6b63c6943c6f9c7f2c0623e8 330111: 9f7a0a2b604235cd3d911a9024abd8fc9b85dce7 v: v3 --- [refs] | 2 +- trunk/drivers/rtc/rtc-tps65910.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 427fa6399232..19afd8bdd952 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 651fb48034ee2cf36d4c8d1cc86ba923a3c82b0d +refs/heads/master: 06f77d18e4be0837868ebba8dff4097103e484c4 diff --git a/trunk/drivers/rtc/rtc-tps65910.c b/trunk/drivers/rtc/rtc-tps65910.c index 7c4ca8605741..7a82337e4dee 100644 --- a/trunk/drivers/rtc/rtc-tps65910.c +++ b/trunk/drivers/rtc/rtc-tps65910.c @@ -226,7 +226,6 @@ static int __devinit tps65910_rtc_probe(struct platform_device *pdev) { struct tps65910 *tps65910 = NULL; struct tps65910_rtc *tps_rtc = NULL; - struct tps65910_board *pmic_plat_data; int ret; int irq; u32 rtc_reg; @@ -253,15 +252,13 @@ static int __devinit tps65910_rtc_probe(struct platform_device *pdev) if (ret < 0) return ret; - pmic_plat_data = dev_get_platdata(tps65910->dev); - irq = pmic_plat_data->irq_base; + irq = platform_get_irq(pdev, 0); if (irq <= 0) { dev_warn(&pdev->dev, "Wake up is not possible as irq = %d\n", irq); return ret; } - irq += TPS65910_IRQ_RTC_ALARM; ret = devm_request_threaded_irq(&pdev->dev, irq, NULL, tps65910_rtc_interrupt, IRQF_TRIGGER_LOW, "rtc-tps65910", &pdev->dev);