Commit 19b8d887 authored by Jingoo Han's avatar Jingoo Han Committed by Linus Torvalds
Browse files

rtc: rtc-m48t59: use devm_*() functions 



Use devm_*() functions to make cleanup paths simpler.

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 073bf424

drivers/rtc/rtc-m48t59.c

+17 −36
Original line number Diff line number Diff line
@@ -409,7 +409,8 @@ static int m48t59_rtc_probe(struct platform_device *pdev) 
	} else if (res->flags & IORESOURCE_MEM) {

		/* we are memory-mapped */

		if (!pdata) {

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

			pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata),

						GFP_KERNEL);

			if (!pdata)

				return -ENOMEM;

			/* Ensure we only kmalloc platform data once */
@@ -425,7 +426,7 @@ static int m48t59_rtc_probe(struct platform_device *pdev) 
			pdata->read_byte = m48t59_mem_readb;

	}



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

	m48t59 = devm_kzalloc(&pdev->dev, sizeof(*m48t59), GFP_KERNEL);

	if (!m48t59)

		return -ENOMEM;
@@ -433,9 +434,10 @@ static int m48t59_rtc_probe(struct platform_device *pdev) 


	if (!m48t59->ioaddr) {

		/* ioaddr not mapped externally */

		m48t59->ioaddr = ioremap(res->start, resource_size(res));

		m48t59->ioaddr = devm_ioremap(&pdev->dev, res->start,

						resource_size(res));

		if (!m48t59->ioaddr)

			goto out;

			return ret;

	}



	/* Try to get irq number. We also can work in
@@ -446,10 +448,11 @@ static int m48t59_rtc_probe(struct platform_device *pdev) 
		m48t59->irq = NO_IRQ;



	if (m48t59->irq != NO_IRQ) {

		ret = request_irq(m48t59->irq, m48t59_rtc_interrupt,

			IRQF_SHARED, "rtc-m48t59", &pdev->dev);

		ret = devm_request_irq(&pdev->dev, m48t59->irq,

				m48t59_rtc_interrupt, IRQF_SHARED,

				"rtc-m48t59", &pdev->dev);

		if (ret)

			goto out;

			return ret;

	}

	switch (pdata->type) {

	case M48T59RTC_TYPE_M48T59:
@@ -469,51 +472,29 @@ static int m48t59_rtc_probe(struct platform_device *pdev) 
		break;

	default:

		dev_err(&pdev->dev, "Unknown RTC type\n");

		ret = -ENODEV;

		goto out;

		return -ENODEV;

	}



	spin_lock_init(&m48t59->lock);

	platform_set_drvdata(pdev, m48t59);



	m48t59->rtc = rtc_device_register(name, &pdev->dev, ops, THIS_MODULE);

	if (IS_ERR(m48t59->rtc)) {

		ret = PTR_ERR(m48t59->rtc);

		goto out;

	}

	m48t59->rtc = devm_rtc_device_register(&pdev->dev, name, ops,

						THIS_MODULE);

	if (IS_ERR(m48t59->rtc))

		return PTR_ERR(m48t59->rtc);



	m48t59_nvram_attr.size = pdata->offset;



	ret = sysfs_create_bin_file(&pdev->dev.kobj, &m48t59_nvram_attr);

	if (ret) {

		rtc_device_unregister(m48t59->rtc);

		goto out;

	}

	if (ret)

		return ret;



	return 0;



out:

	if (m48t59->irq != NO_IRQ)

		free_irq(m48t59->irq, &pdev->dev);

	if (m48t59->ioaddr)

		iounmap(m48t59->ioaddr);

		kfree(m48t59);

	return ret;

}



static int m48t59_rtc_remove(struct platform_device *pdev)

{

	struct m48t59_private *m48t59 = platform_get_drvdata(pdev);

	struct m48t59_plat_data *pdata = pdev->dev.platform_data;



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

	if (!IS_ERR(m48t59->rtc))

		rtc_device_unregister(m48t59->rtc);

	if (m48t59->ioaddr && !pdata->ioaddr)

		iounmap(m48t59->ioaddr);

	if (m48t59->irq != NO_IRQ)

		free_irq(m48t59->irq, &pdev->dev);

	kfree(m48t59);

	return 0;

}