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

Commit fe2e1cf8 authored by Mike Frysinger's avatar Mike Frysinger Committed by Linus Torvalds
Browse files

Blackfin RTC Driver: move irq request/free out of open/release and into... 


Blackfin RTC Driver: move irq request/free out of open/release and into probe/remove so that the non-dev interfaces (like sysfs) work as expected

Signed-off-by: default avatarMike Frysinger <vapier.adi@gmail.com>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1804dc6e

drivers/rtc/rtc-bfin.c

+20 −31
Original line number Diff line number Diff line
@@ -218,26 +218,6 @@ static irqreturn_t bfin_rtc_interrupt(int irq, void *dev_id) 
		return IRQ_NONE;

}



static int bfin_rtc_open(struct device *dev)

{

	int ret;



	dev_dbg_stamp(dev);



	ret = request_irq(IRQ_RTC, bfin_rtc_interrupt, IRQF_SHARED, to_platform_device(dev)->name, dev);

	if (!ret)

		bfin_rtc_reset(dev, RTC_ISTAT_WRITE_COMPLETE);



	return ret;

}



static void bfin_rtc_release(struct device *dev)

{

	dev_dbg_stamp(dev);

	bfin_rtc_reset(dev, 0);

	free_irq(IRQ_RTC, dev);

}



static void bfin_rtc_int_set(u16 rtc_int)

{

	bfin_write_RTC_ISTAT(rtc_int);
@@ -370,8 +350,6 @@ static int bfin_rtc_proc(struct device *dev, struct seq_file *seq) 
}



static struct rtc_class_ops bfin_rtc_ops = {

	.open          = bfin_rtc_open,

	.release       = bfin_rtc_release,

	.ioctl         = bfin_rtc_ioctl,

	.read_time     = bfin_rtc_read_time,

	.set_time      = bfin_rtc_set_time,
@@ -383,29 +361,37 @@ static struct rtc_class_ops bfin_rtc_ops = { 
static int __devinit bfin_rtc_probe(struct platform_device *pdev)

{

	struct bfin_rtc *rtc;

	struct device *dev = &pdev->dev;

	int ret = 0;



	dev_dbg_stamp(&pdev->dev);

	dev_dbg_stamp(dev);



	/* Allocate memory for our RTC struct */

	rtc = kzalloc(sizeof(*rtc), GFP_KERNEL);

	if (unlikely(!rtc))

		return -ENOMEM;

	platform_set_drvdata(pdev, rtc);



	rtc->rtc_dev = rtc_device_register(pdev->name, &pdev->dev, &bfin_rtc_ops, THIS_MODULE);

	if (IS_ERR(rtc)) {

		ret = PTR_ERR(rtc->rtc_dev);

	/* Grab the IRQ and init the hardware */

	ret = request_irq(IRQ_RTC, bfin_rtc_interrupt, IRQF_SHARED, pdev->name, dev);

	if (unlikely(ret))

		goto err;

	}



	/* see comment at top of file about stopwatch/PIE */

	bfin_rtc_reset(dev, RTC_ISTAT_WRITE_COMPLETE);

	bfin_write_RTC_SWCNT(0);



	platform_set_drvdata(pdev, rtc);

	/* Register our RTC with the RTC framework */

	rtc->rtc_dev = rtc_device_register(pdev->name, dev, &bfin_rtc_ops, THIS_MODULE);

	if (unlikely(IS_ERR(rtc))) {

		ret = PTR_ERR(rtc->rtc_dev);

		goto err_irq;

	}



	device_init_wakeup(&pdev->dev, 1);

	device_init_wakeup(dev, 1);



	return 0;



 err_irq:

	free_irq(IRQ_RTC, dev);

 err:

	kfree(rtc);

	return ret;
@@ -414,7 +400,10 @@ static int __devinit bfin_rtc_probe(struct platform_device *pdev) 
static int __devexit bfin_rtc_remove(struct platform_device *pdev)

{

	struct bfin_rtc *rtc = platform_get_drvdata(pdev);

	struct device *dev = &pdev->dev;



	bfin_rtc_reset(dev, 0);

	free_irq(IRQ_RTC, dev);

	rtc_device_unregister(rtc->rtc_dev);

	platform_set_drvdata(pdev, NULL);

	kfree(rtc);