Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2fac6674 authored by Anton Vorontsov's avatar Anton Vorontsov Committed by Linus Torvalds
Browse files

rtc: bunch of drivers: fix 'no irq' case handing 



This patch fixes a bunch of irq checking misuses.  Most drivers were
getting irq via platform_get_irq(), which returns -ENXIO or r->start.

rtc-cmos.c is special.  It is using PNP and platform bindings.  Hopefully
nobody is using PNP IRQ 0 for RTC.  So the changes should be safe.

rtc-sh.c is using platform_get_irq, but was storing a result into an
unsigned type, then was checking for < 0.  This is fixed now.

Signed-off-by: default avatarAnton Vorontsov <avorontsov@ru.mvista.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Acked-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Acked-by: default avatarPaul Mundt <lethal@linux-sh.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d4afc76c

drivers/rtc/rtc-at32ap700x.c

+2 −2
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ static int __init at32_rtc_probe(struct platform_device *pdev) 
{

	struct resource	*regs;

	struct rtc_at32ap700x *rtc;

	int irq = -1;

	int irq;

	int ret;



	rtc = kzalloc(sizeof(struct rtc_at32ap700x), GFP_KERNEL);
@@ -222,7 +222,7 @@ static int __init at32_rtc_probe(struct platform_device *pdev) 
	}



	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

	if (irq <= 0) {

		dev_dbg(&pdev->dev, "could not get irq\n");

		ret = -ENXIO;

		goto out;

drivers/rtc/rtc-cmos.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ struct cmos_rtc { 
};



/* both platform and pnp busses use negative numbers for invalid irqs */

#define is_valid_irq(n)		((n) >= 0)

#define is_valid_irq(n)		((n) > 0)



static const char driver_name[] = "rtc_cmos";

drivers/rtc/rtc-ds1511.c

+9 −10
Original line number Diff line number Diff line
@@ -326,9 +326,9 @@ ds1511_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) 
	struct platform_device *pdev = to_platform_device(dev);

	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);



	if (pdata->irq < 0) {

	if (pdata->irq <= 0)

		return -EINVAL;

	}



	pdata->alrm_mday = alrm->time.tm_mday;

	pdata->alrm_hour = alrm->time.tm_hour;

	pdata->alrm_min = alrm->time.tm_min;
@@ -346,9 +346,9 @@ ds1511_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) 
	struct platform_device *pdev = to_platform_device(dev);

	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);



	if (pdata->irq < 0) {

	if (pdata->irq <= 0)

		return -EINVAL;

	}



	alrm->time.tm_mday = pdata->alrm_mday < 0 ? 0 : pdata->alrm_mday;

	alrm->time.tm_hour = pdata->alrm_hour < 0 ? 0 : pdata->alrm_hour;

	alrm->time.tm_min = pdata->alrm_min < 0 ? 0 : pdata->alrm_min;
@@ -385,7 +385,7 @@ ds1511_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long arg) 
	struct platform_device *pdev = to_platform_device(dev);

	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);



	if (pdata->irq < 0) {

	if (pdata->irq <= 0) {

		return -ENOIOCTLCMD; /* fall back into rtc-dev's emulation */

	}

	switch (cmd) {
@@ -503,7 +503,6 @@ ds1511_rtc_probe(struct platform_device *pdev) 
	if (!pdata) {

		return -ENOMEM;

	}

	pdata->irq = -1;

	pdata->size = res->end - res->start + 1;

	if (!request_mem_region(res->start, pdata->size, pdev->name)) {

		ret = -EBUSY;
@@ -545,13 +544,13 @@ ds1511_rtc_probe(struct platform_device *pdev) 
	 * if the platform has an interrupt in mind for this device,

	 * then by all means, set it

	 */

	if (pdata->irq >= 0) {

	if (pdata->irq > 0) {

		rtc_read(RTC_CMD1);

		if (request_irq(pdata->irq, ds1511_interrupt,

			IRQF_DISABLED | IRQF_SHARED, pdev->name, pdev) < 0) {



			dev_warn(&pdev->dev, "interrupt not available.\n");

			pdata->irq = -1;

			pdata->irq = 0;

		}

	}
@@ -572,7 +571,7 @@ ds1511_rtc_probe(struct platform_device *pdev) 
	if (pdata->rtc) {

		rtc_device_unregister(pdata->rtc);

	}

	if (pdata->irq >= 0) {

	if (pdata->irq > 0) {

		free_irq(pdata->irq, pdev);

	}

	if (ds1511_base) {
@@ -595,7 +594,7 @@ ds1511_rtc_remove(struct platform_device *pdev) 
	sysfs_remove_bin_file(&pdev->dev.kobj, &ds1511_nvram_attr);

	rtc_device_unregister(pdata->rtc);

	pdata->rtc = NULL;

	if (pdata->irq >= 0) {

	if (pdata->irq > 0) {

		/*

		 * disable the alarm interrupt

		 */

drivers/rtc/rtc-ds1553.c

+7 −8
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ static int ds1553_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm) 
	struct platform_device *pdev = to_platform_device(dev);

	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);



	if (pdata->irq < 0)

	if (pdata->irq <= 0)

		return -EINVAL;

	pdata->alrm_mday = alrm->time.tm_mday;

	pdata->alrm_hour = alrm->time.tm_hour;
@@ -179,7 +179,7 @@ static int ds1553_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) 
	struct platform_device *pdev = to_platform_device(dev);

	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);



	if (pdata->irq < 0)

	if (pdata->irq <= 0)

		return -EINVAL;

	alrm->time.tm_mday = pdata->alrm_mday < 0 ? 0 : pdata->alrm_mday;

	alrm->time.tm_hour = pdata->alrm_hour < 0 ? 0 : pdata->alrm_hour;
@@ -213,7 +213,7 @@ static int ds1553_rtc_ioctl(struct device *dev, unsigned int cmd, 
	struct platform_device *pdev = to_platform_device(dev);

	struct rtc_plat_data *pdata = platform_get_drvdata(pdev);



	if (pdata->irq < 0)

	if (pdata->irq <= 0)

		return -ENOIOCTLCMD; /* fall back into rtc-dev's emulation */

	switch (cmd) {

	case RTC_AIE_OFF:
@@ -301,7 +301,6 @@ static int __devinit ds1553_rtc_probe(struct platform_device *pdev) 
	pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);

	if (!pdata)

		return -ENOMEM;

	pdata->irq = -1;

	if (!request_mem_region(res->start, RTC_REG_SIZE, pdev->name)) {

		ret = -EBUSY;

		goto out;
@@ -327,13 +326,13 @@ static int __devinit ds1553_rtc_probe(struct platform_device *pdev) 
	if (readb(ioaddr + RTC_FLAGS) & RTC_FLAGS_BLF)

		dev_warn(&pdev->dev, "voltage-low detected.\n");



	if (pdata->irq >= 0) {

	if (pdata->irq > 0) {

		writeb(0, ioaddr + RTC_INTERRUPTS);

		if (request_irq(pdata->irq, ds1553_rtc_interrupt,

				IRQF_DISABLED | IRQF_SHARED,

				pdev->name, pdev) < 0) {

			dev_warn(&pdev->dev, "interrupt not available.\n");

			pdata->irq = -1;

			pdata->irq = 0;

		}

	}
@@ -353,7 +352,7 @@ static int __devinit ds1553_rtc_probe(struct platform_device *pdev) 
 out:

	if (pdata->rtc)

		rtc_device_unregister(pdata->rtc);

	if (pdata->irq >= 0)

	if (pdata->irq > 0)

		free_irq(pdata->irq, pdev);

	if (ioaddr)

		iounmap(ioaddr);
@@ -369,7 +368,7 @@ static int __devexit ds1553_rtc_remove(struct platform_device *pdev) 


	sysfs_remove_bin_file(&pdev->dev.kobj, &ds1553_nvram_attr);

	rtc_device_unregister(pdata->rtc);

	if (pdata->irq >= 0) {

	if (pdata->irq > 0) {

		writeb(0, pdata->ioaddr + RTC_INTERRUPTS);

		free_irq(pdata->irq, pdev);

	}

drivers/rtc/rtc-m48t59.c

+1 −1
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ static int __devinit m48t59_rtc_probe(struct platform_device *pdev) 
	 * the mode without IRQ.

	 */

	m48t59->irq = platform_get_irq(pdev, 0);

	if (m48t59->irq < 0)

	if (m48t59->irq <= 0)

		m48t59->irq = NO_IRQ;



	if (m48t59->irq != NO_IRQ) {