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

Commit 39b553db authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Mauro Carvalho Chehab
Browse files

[media] pxa-camera: move interface activation and deactivation to clock callbacks 



When adding and removing a client, the pxa-camera driver only activates
and deactivates its camera interface respectively, which doesn't include
any client-specific actions. Move this functionality into .clock_start()
and .clock_stop() callbacks.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent eb569cf9

drivers/media/platform/soc_camera/pxa_camera.c

+18 −10
Original line number Diff line number Diff line
@@ -955,33 +955,39 @@ static irqreturn_t pxa_camera_irq(int irq, void *data) 
	return IRQ_HANDLED;

}



static int pxa_camera_add_device(struct soc_camera_device *icd)

{

	dev_info(icd->parent, "PXA Camera driver attached to camera %d\n",

		 icd->devnum);



	return 0;

}



static void pxa_camera_remove_device(struct soc_camera_device *icd)

{

	dev_info(icd->parent, "PXA Camera driver detached from camera %d\n",

		 icd->devnum);

}



/*

 * The following two functions absolutely depend on the fact, that

 * there can be only one camera on PXA quick capture interface

 * Called with .host_lock held

 */

static int pxa_camera_add_device(struct soc_camera_device *icd)

static int pxa_camera_clock_start(struct soc_camera_host *ici)

{

	struct soc_camera_host *ici = to_soc_camera_host(icd->parent);

	struct pxa_camera_dev *pcdev = ici->priv;



	pxa_camera_activate(pcdev);



	dev_info(icd->parent, "PXA Camera driver attached to camera %d\n",

		 icd->devnum);



	return 0;

}



/* Called with .host_lock held */

static void pxa_camera_remove_device(struct soc_camera_device *icd)

static void pxa_camera_clock_stop(struct soc_camera_host *ici)

{

	struct soc_camera_host *ici = to_soc_camera_host(icd->parent);

	struct pxa_camera_dev *pcdev = ici->priv;



	dev_info(icd->parent, "PXA Camera driver detached from camera %d\n",

		 icd->devnum);



	/* disable capture, disable interrupts */

	__raw_writel(0x3ff, pcdev->base + CICR0);
@@ -1630,6 +1636,8 @@ static struct soc_camera_host_ops pxa_soc_camera_host_ops = { 
	.owner		= THIS_MODULE,

	.add		= pxa_camera_add_device,

	.remove		= pxa_camera_remove_device,

	.clock_start	= pxa_camera_clock_start,

	.clock_stop	= pxa_camera_clock_stop,

	.set_crop	= pxa_camera_set_crop,

	.get_formats	= pxa_camera_get_formats,

	.put_formats	= pxa_camera_put_formats,