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

Commit 9c63e01e authored by Lad, Prabhakar's avatar Lad, Prabhakar Committed by Mauro Carvalho Chehab
Browse files

[media] media: davinci: vpif_display: Convert to devm_* api 



use devm_request_irq() instead of request_irq(). This ensures
more consistent error values and simplifies error paths.

Signed-off-by: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent b8d067b6

drivers/media/platform/davinci/vpif_display.c

+10 −25
Original line number Diff line number Diff line
@@ -1652,15 +1652,14 @@ static __init int vpif_probe(struct platform_device *pdev) 


	while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, res_idx))) {

		for (i = res->start; i <= res->end; i++) {

			if (request_irq(i, vpif_channel_isr, IRQF_SHARED,

					"VPIF_Display", (void *)

					(&vpif_obj.dev[res_idx]->channel_id))) {

				err = -EBUSY;

				for (j = 0; j < i; j++)

					free_irq(j, (void *)

					(&vpif_obj.dev[res_idx]->channel_id));

			err = devm_request_irq(&pdev->dev, i, vpif_channel_isr,

					     IRQF_SHARED, "VPIF_Display",

					     (void *)(&vpif_obj.dev[res_idx]->

					     channel_id));

			if (err) {

				err = -EINVAL;

				vpif_err("VPIF IRQ request failed\n");

				goto vpif_int_err;

				goto vpif_unregister;

			}

		}

		res_idx++;
@@ -1678,7 +1677,7 @@ static __init int vpif_probe(struct platform_device *pdev) 
				video_device_release(ch->video_dev);

			}

			err = -ENOMEM;

			goto vpif_int_err;

			goto vpif_unregister;

		}



		/* Initialize field of video device */
@@ -1812,13 +1811,8 @@ vpif_sd_error: 
		/* Note: does nothing if ch->video_dev == NULL */

		video_device_release(ch->video_dev);

	}

vpif_int_err:

vpif_unregister:

	v4l2_device_unregister(&vpif_obj.v4l2_dev);

	for (i = 0; i < res_idx; i++) {

		res = platform_get_resource(pdev, IORESOURCE_IRQ, i);

		for (j = res->start; j <= res->end; j++)

			free_irq(j, (void *)(&vpif_obj.dev[i]->channel_id));

	}



	return err;

}
@@ -1829,16 +1823,7 @@ vpif_int_err: 
static int vpif_remove(struct platform_device *device)

{

	struct channel_obj *ch;

	struct resource *res;

	int irq_num;

	int i = 0;



	while ((res = platform_get_resource(device, IORESOURCE_IRQ, i))) {

		for (irq_num = res->start; irq_num <= res->end; irq_num++)

			free_irq(irq_num,

				 (void *)(&vpif_obj.dev[i]->channel_id));

		i++;

	}

	int i;



	v4l2_device_unregister(&vpif_obj.v4l2_dev);