Message ID | 1258495463-26029-4-git-send-email-ospite@studenti.unina.it (mailing list archive) |
---|---|
State | Superseded, archived |
Headers |
Return-path: <linux-media-owner@vger.kernel.org> Envelope-to: mchehab@infradead.org Delivery-date: Tue, 17 Nov 2009 22:13:13 +0000 Received: from bombadil.infradead.org [18.85.46.34] by pedra.chehab.org with IMAP (fetchmail-6.3.6) for <mchehab@localhost> (single-drop); Tue, 17 Nov 2009 20:16:02 -0200 (BRST) Received: from vger.kernel.org ([209.132.176.167]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1NAWIT-0007xv-3W; Tue, 17 Nov 2009 22:13:13 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756184AbZKQWMr (ORCPT <rfc822; kmpark@infradead.org> + 1 other); Tue, 17 Nov 2009 17:12:47 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755504AbZKQWMr (ORCPT <rfc822;linux-media-outgoing>); Tue, 17 Nov 2009 17:12:47 -0500 Received: from smtp-OUT05A.alice.it ([85.33.3.5]:1091 "EHLO smtp-OUT05A.alice.it" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756156AbZKQWMq (ORCPT <rfc822;linux-media@vger.kernel.org>); Tue, 17 Nov 2009 17:12:46 -0500 Received: from FBCMMO02.fbc.local ([192.168.68.196]) by smtp-OUT05A.alice.it with Microsoft SMTPSVC(6.0.3790.3959); Tue, 17 Nov 2009 23:12:51 +0100 Received: from FBCMCL01B03.fbc.local ([192.168.69.84]) by FBCMMO02.fbc.local with Microsoft SMTPSVC(6.0.3790.3959); Tue, 17 Nov 2009 23:12:49 +0100 Received: from badebec ([79.2.139.137]) by FBCMCL01B03.fbc.local with Microsoft SMTPSVC(6.0.3790.3959); Tue, 17 Nov 2009 23:04:51 +0100 Received: by badebec with local (Exim 4.69) (envelope-from <ospite@studenti.unina.it>) id 1NAWAD-0006mV-DC; Tue, 17 Nov 2009 23:04:41 +0100 From: Antonio Ospite <ospite@studenti.unina.it> To: linux-media@vger.kernel.org Cc: Antonio Ospite <ospite@studenti.unina.it>, Guennadi Liakhovetski <g.liakhovetski@gmx.de>, Eric Miao <eric.y.miao@gmail.com>, linux-arm-kernel@lists.infradead.org, Mike Rapoport <mike@compulab.co.il>, Juergen Beisert <j.beisert@pengutronix.de>, Robert Jarzmik <robert.jarzmik@free.fr> Subject: [PATCH 3/3] pxa_camera: remove init() callback Date: Tue, 17 Nov 2009 23:04:23 +0100 Message-Id: <1258495463-26029-4-git-send-email-ospite@studenti.unina.it> X-Mailer: git-send-email 1.6.5.2 In-Reply-To: <1258495463-26029-1-git-send-email-ospite@studenti.unina.it> References: <1258495463-26029-1-git-send-email-ospite@studenti.unina.it> X-OriginalArrivalTime: 17 Nov 2009 22:04:51.0659 (UTC) FILETIME=[FC8FD1B0:01CA67D1] Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: <linux-media.vger.kernel.org> X-Mailing-List: linux-media@vger.kernel.org |
Commit Message
Antonio Ospite
Nov. 17, 2009, 10:04 p.m. UTC
pxa_camera init() callback is sometimes abused to setup MFP for PXA CIF, or
even to request GPIOs to be used by the camera *sensor*. These initializations
can be performed statically in machine init functions.
The current semantics for this init() callback is ambiguous anyways, it is
invoked in pxa_camera_activate(), hence at device node open, but its users use
it like a generic initialization to be done at module init time (configure
MFP, request GPIOs for *sensor* control).
Signed-off-by: Antonio Ospite <ospite@studenti.unina.it>
---
arch/arm/mach-pxa/include/mach/camera.h | 2 --
drivers/media/video/pxa_camera.c | 10 ----------
2 files changed, 0 insertions(+), 12 deletions(-)
Comments
On Tue, 17 Nov 2009, Antonio Ospite wrote: > pxa_camera init() callback is sometimes abused to setup MFP for PXA CIF, or > even to request GPIOs to be used by the camera *sensor*. These initializations > can be performed statically in machine init functions. > > The current semantics for this init() callback is ambiguous anyways, it is > invoked in pxa_camera_activate(), hence at device node open, but its users use > it like a generic initialization to be done at module init time (configure > MFP, request GPIOs for *sensor* control). > > Signed-off-by: Antonio Ospite <ospite@studenti.unina.it> Antonio, to make the merging easier and avoid imposing extra dependencies, I would postpone this to 2.6.34, and just remove uses of .init() by pxa-camera users as per your other two patches. Would this be ok with you? Thanks Guennadi > --- > arch/arm/mach-pxa/include/mach/camera.h | 2 -- > drivers/media/video/pxa_camera.c | 10 ---------- > 2 files changed, 0 insertions(+), 12 deletions(-) > > diff --git a/arch/arm/mach-pxa/include/mach/camera.h b/arch/arm/mach-pxa/include/mach/camera.h > index 31abe6d..6709b1c 100644 > --- a/arch/arm/mach-pxa/include/mach/camera.h > +++ b/arch/arm/mach-pxa/include/mach/camera.h > @@ -35,8 +35,6 @@ > #define PXA_CAMERA_VSP 0x400 > > struct pxacamera_platform_data { > - int (*init)(struct device *); > - > unsigned long flags; > unsigned long mclk_10khz; > }; > diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c > index 51b683c..49f2bf9 100644 > --- a/drivers/media/video/pxa_camera.c > +++ b/drivers/media/video/pxa_camera.c > @@ -882,18 +882,8 @@ static void recalculate_fifo_timeout(struct pxa_camera_dev *pcdev, > > static void pxa_camera_activate(struct pxa_camera_dev *pcdev) > { > - struct pxacamera_platform_data *pdata = pcdev->pdata; > - struct device *dev = pcdev->soc_host.v4l2_dev.dev; > u32 cicr4 = 0; > > - dev_dbg(dev, "Registered platform device at %p data %p\n", > - pcdev, pdata); > - > - if (pdata && pdata->init) { > - dev_dbg(dev, "%s: Init gpios\n", __func__); > - pdata->init(dev); > - } > - > /* disable all interrupts */ > __raw_writel(0x3ff, pcdev->base + CICR0); > > -- > 1.6.5.2 > --- Guennadi Liakhovetski, Ph.D. Freelance Open-Source Software Developer http://www.open-technology.de/ -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, 27 Nov 2009 15:06:53 +0100 (CET) Guennadi Liakhovetski <g.liakhovetski@gmx.de> wrote: > On Tue, 17 Nov 2009, Antonio Ospite wrote: > > > pxa_camera init() callback is sometimes abused to setup MFP for PXA CIF, or > > even to request GPIOs to be used by the camera *sensor*. These initializations > > can be performed statically in machine init functions. > > > > The current semantics for this init() callback is ambiguous anyways, it is > > invoked in pxa_camera_activate(), hence at device node open, but its users use > > it like a generic initialization to be done at module init time (configure > > MFP, request GPIOs for *sensor* control). > > > > Signed-off-by: Antonio Ospite <ospite@studenti.unina.it> > > Antonio, to make the merging easier and avoid imposing extra dependencies, > I would postpone this to 2.6.34, and just remove uses of .init() by > pxa-camera users as per your other two patches. Would this be ok with you? > > Thanks > Guennadi > Perfectly fine with me. Feel also free to anticipate me and edit the commit messages to whatever you want in the first two patches. Now that we aren't removing init() immediately after these it makes even more sense to change the phrasing from a future referencing "init() is going to be removed" to a more present focused "better not to use init() at all" form. Thanks, Antonio
On Fri, 27 Nov 2009, Antonio Ospite wrote: > On Fri, 27 Nov 2009 15:06:53 +0100 (CET) > Guennadi Liakhovetski <g.liakhovetski@gmx.de> wrote: > > > On Tue, 17 Nov 2009, Antonio Ospite wrote: > > > > > pxa_camera init() callback is sometimes abused to setup MFP for PXA CIF, or > > > even to request GPIOs to be used by the camera *sensor*. These initializations > > > can be performed statically in machine init functions. > > > > > > The current semantics for this init() callback is ambiguous anyways, it is > > > invoked in pxa_camera_activate(), hence at device node open, but its users use > > > it like a generic initialization to be done at module init time (configure > > > MFP, request GPIOs for *sensor* control). > > > > > > Signed-off-by: Antonio Ospite <ospite@studenti.unina.it> > > > > Antonio, to make the merging easier and avoid imposing extra dependencies, > > I would postpone this to 2.6.34, and just remove uses of .init() by > > pxa-camera users as per your other two patches. Would this be ok with you? > > > > Thanks > > Guennadi > > > > Perfectly fine with me. > > Feel also free to anticipate me and edit the commit messages to > whatever you want in the first two patches. Now that we aren't removing > init() immediately after these it makes even more sense to change the > phrasing from a future referencing > "init() is going to be removed" > to a more present focused > "better not to use init() at all" > form. I cannot edit those subject lines, because I will not be handling those patches, they will go via the PXA tree, that's why it is easier to wait with the pxa patch. Thanks Guennadi --- Guennadi Liakhovetski, Ph.D. Freelance Open-Source Software Developer http://www.open-technology.de/ -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, 27 Nov 2009 15:37:19 +0100 (CET) Guennadi Liakhovetski <g.liakhovetski@gmx.de> wrote: > On Fri, 27 Nov 2009, Antonio Ospite wrote: > > > On Fri, 27 Nov 2009 15:06:53 +0100 (CET) > > Guennadi Liakhovetski <g.liakhovetski@gmx.de> wrote: > > > > > On Tue, 17 Nov 2009, Antonio Ospite wrote: > > > > > > > pxa_camera init() callback is sometimes abused to setup MFP for PXA CIF, or > > > > even to request GPIOs to be used by the camera *sensor*. These initializations > > > > can be performed statically in machine init functions. > > > > > > > > The current semantics for this init() callback is ambiguous anyways, it is > > > > invoked in pxa_camera_activate(), hence at device node open, but its users use > > > > it like a generic initialization to be done at module init time (configure > > > > MFP, request GPIOs for *sensor* control). > > > > > > > > Signed-off-by: Antonio Ospite <ospite@studenti.unina.it> > > > > > > Antonio, to make the merging easier and avoid imposing extra dependencies, > > > I would postpone this to 2.6.34, and just remove uses of .init() by > > > pxa-camera users as per your other two patches. Would this be ok with you? > > > > > > Thanks > > > Guennadi > > > > > > > Perfectly fine with me. > > > > Feel also free to anticipate me and edit the commit messages to > > whatever you want in the first two patches. Now that we aren't removing > > init() immediately after these it makes even more sense to change the > > phrasing from a future referencing > > "init() is going to be removed" > > to a more present focused > > "better not to use init() at all" > > form. > > I cannot edit those subject lines, because I will not be handling those > patches, they will go via the PXA tree, that's why it is easier to wait > with the pxa patch. > I see, I am sending a v2 for the first two patches with changed commit messages in some hours then. Sorry for the delay. > Thanks > Guennadi > --- > Guennadi Liakhovetski, Ph.D. > Freelance Open-Source Software Developer > http://www.open-technology.de/ Regards, Antonio
diff --git a/arch/arm/mach-pxa/include/mach/camera.h b/arch/arm/mach-pxa/include/mach/camera.h index 31abe6d..6709b1c 100644 --- a/arch/arm/mach-pxa/include/mach/camera.h +++ b/arch/arm/mach-pxa/include/mach/camera.h @@ -35,8 +35,6 @@ #define PXA_CAMERA_VSP 0x400 struct pxacamera_platform_data { - int (*init)(struct device *); - unsigned long flags; unsigned long mclk_10khz; }; diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c index 51b683c..49f2bf9 100644 --- a/drivers/media/video/pxa_camera.c +++ b/drivers/media/video/pxa_camera.c @@ -882,18 +882,8 @@ static void recalculate_fifo_timeout(struct pxa_camera_dev *pcdev, static void pxa_camera_activate(struct pxa_camera_dev *pcdev) { - struct pxacamera_platform_data *pdata = pcdev->pdata; - struct device *dev = pcdev->soc_host.v4l2_dev.dev; u32 cicr4 = 0; - dev_dbg(dev, "Registered platform device at %p data %p\n", - pcdev, pdata); - - if (pdata && pdata->init) { - dev_dbg(dev, "%s: Init gpios\n", __func__); - pdata->init(dev); - } - /* disable all interrupts */ __raw_writel(0x3ff, pcdev->base + CICR0);