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

Commit 099256e5 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Mauro Carvalho Chehab
Browse files

[media] media: rc: nuvoton-cir: switch resource handling to devm functions 



Switch to managed resource handling using the devm_ functions.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent d5b04311

drivers/media/rc/nuvoton-cir.c

+11 −25
Original line number Diff line number Diff line
@@ -971,7 +971,7 @@ static int nvt_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id) 
	struct rc_dev *rdev;

	int ret = -ENOMEM;



	nvt = kzalloc(sizeof(struct nvt_dev), GFP_KERNEL);

	nvt = devm_kzalloc(&pdev->dev, sizeof(struct nvt_dev), GFP_KERNEL);

	if (!nvt)

		return ret;
@@ -1071,21 +1071,22 @@ static int nvt_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id) 


	ret = -EBUSY;

	/* now claim resources */

	if (!request_region(nvt->cir_addr,

	if (!devm_request_region(&pdev->dev, nvt->cir_addr,

			    CIR_IOREG_LENGTH, NVT_DRIVER_NAME))

		goto exit_unregister_device;



	if (request_irq(nvt->cir_irq, nvt_cir_isr, IRQF_SHARED,

			NVT_DRIVER_NAME, (void *)nvt))

		goto exit_release_cir_addr;

	if (devm_request_irq(&pdev->dev, nvt->cir_irq, nvt_cir_isr,

			     IRQF_SHARED, NVT_DRIVER_NAME, (void *)nvt))

		goto exit_unregister_device;



	if (!request_region(nvt->cir_wake_addr,

	if (!devm_request_region(&pdev->dev, nvt->cir_wake_addr,

			    CIR_IOREG_LENGTH, NVT_DRIVER_NAME))

		goto exit_free_irq;

		goto exit_unregister_device;



	if (request_irq(nvt->cir_wake_irq, nvt_cir_wake_isr, IRQF_SHARED,

	if (devm_request_irq(&pdev->dev, nvt->cir_wake_irq,

			     nvt_cir_wake_isr, IRQF_SHARED,

			     NVT_DRIVER_NAME, (void *)nvt))

		goto exit_release_cir_wake_addr;

		goto exit_unregister_device;



	device_init_wakeup(&pdev->dev, true);
@@ -1097,18 +1098,11 @@ static int nvt_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id) 


	return 0;



exit_release_cir_wake_addr:

	release_region(nvt->cir_wake_addr, CIR_IOREG_LENGTH);

exit_free_irq:

	free_irq(nvt->cir_irq, nvt);

exit_release_cir_addr:

	release_region(nvt->cir_addr, CIR_IOREG_LENGTH);

exit_unregister_device:

	rc_unregister_device(rdev);

	rdev = NULL;

exit_free_dev_rdev:

	rc_free_device(rdev);

	kfree(nvt);



	return ret;

}
@@ -1126,15 +1120,7 @@ static void nvt_remove(struct pnp_dev *pdev) 
	nvt_enable_wake(nvt);

	spin_unlock_irqrestore(&nvt->nvt_lock, flags);



	/* free resources */

	free_irq(nvt->cir_irq, nvt);

	free_irq(nvt->cir_wake_irq, nvt);

	release_region(nvt->cir_addr, CIR_IOREG_LENGTH);

	release_region(nvt->cir_wake_addr, CIR_IOREG_LENGTH);



	rc_unregister_device(nvt->rdev);



	kfree(nvt);

}



static int nvt_suspend(struct pnp_dev *pdev, pm_message_t state)