From patchwork Tue Nov 17 22:04:21 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antonio Ospite X-Patchwork-Id: 2081 Return-path: Envelope-to: mchehab@infradead.org Delivery-date: Tue, 17 Nov 2009 22:08:31 +0000 Received: from bombadil.infradead.org [18.85.46.34] by pedra.chehab.org with IMAP (fetchmail-6.3.6) for (single-drop); Tue, 17 Nov 2009 20:09:52 -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 1NAWDv-0006aJ-L1; Tue, 17 Nov 2009 22:08:31 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754045AbZKQWIY (ORCPT + 1 other); Tue, 17 Nov 2009 17:08:24 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754008AbZKQWIY (ORCPT ); Tue, 17 Nov 2009 17:08:24 -0500 Received: from smtp-out13.alice.it ([85.33.2.18]:4572 "EHLO smtp-out13.alice.it" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753977AbZKQWIX (ORCPT ); Tue, 17 Nov 2009 17:08:23 -0500 Received: from FBCMMO01.fbc.local ([192.168.68.195]) by smtp-out13.alice.it with Microsoft SMTPSVC(6.0.3790.3959); Tue, 17 Nov 2009 23:08:26 +0100 Received: from FBCMCL01B09.fbc.local ([192.168.171.26]) by FBCMMO01.fbc.local with Microsoft SMTPSVC(6.0.3790.3959); Tue, 17 Nov 2009 23:08:26 +0100 Received: from badebec ([79.2.139.137]) by FBCMCL01B09.fbc.local with Microsoft SMTPSVC(6.0.3790.3959); Tue, 17 Nov 2009 23:04:50 +0100 Received: by badebec with local (Exim 4.69) (envelope-from ) id 1NAWAD-0006mR-6q; Tue, 17 Nov 2009 23:04:41 +0100 From: Antonio Ospite To: linux-media@vger.kernel.org Cc: Antonio Ospite , Guennadi Liakhovetski , Eric Miao , linux-arm-kernel@lists.infradead.org, Mike Rapoport , Juergen Beisert , Robert Jarzmik Subject: [PATCH 1/3] em-x270: don't use pxa_camera init() callback Date: Tue, 17 Nov 2009 23:04:21 +0100 Message-Id: <1258495463-26029-2-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:50.0667 (UTC) FILETIME=[FBF873B0:01CA67D1] Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org pxa_camera init() is going to be removed. Signed-off-by: Antonio Ospite Acked-by: Mike Rapoport --- arch/arm/mach-pxa/em-x270.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c index aec7f42..f71f34c 100644 --- a/arch/arm/mach-pxa/em-x270.c +++ b/arch/arm/mach-pxa/em-x270.c @@ -967,7 +967,7 @@ static inline void em_x270_init_gpio_keys(void) {} #if defined(CONFIG_VIDEO_PXA27x) || defined(CONFIG_VIDEO_PXA27x_MODULE) static struct regulator *em_x270_camera_ldo; -static int em_x270_sensor_init(struct device *dev) +static int em_x270_sensor_init(void) { int ret; @@ -996,7 +996,6 @@ static int em_x270_sensor_init(struct device *dev) } struct pxacamera_platform_data em_x270_camera_platform_data = { - .init = em_x270_sensor_init, .flags = PXA_CAMERA_MASTER | PXA_CAMERA_DATAWIDTH_8 | PXA_CAMERA_PCLK_EN | PXA_CAMERA_MCLK_EN, .mclk_10khz = 2600, @@ -1049,8 +1048,10 @@ static struct platform_device em_x270_camera = { static void __init em_x270_init_camera(void) { - pxa_set_camera_info(&em_x270_camera_platform_data); - platform_device_register(&em_x270_camera); + if (em_x270_sensor_init() == 0) { + pxa_set_camera_info(&em_x270_camera_platform_data); + platform_device_register(&em_x270_camera); + } } #else static inline void em_x270_init_camera(void) {}