From patchwork Wed Mar 27 21:06:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Frank Schaefer X-Patchwork-Id: 17686 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1UKxYP-00043A-G1; Wed, 27 Mar 2013 22:06:41 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-2) with esmtp id 1UKxYO-0007Lb-Il; Wed, 27 Mar 2013 22:06:41 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753461Ab3C0VGh (ORCPT + 1 other); Wed, 27 Mar 2013 17:06:37 -0400 Received: from mail-ea0-f174.google.com ([209.85.215.174]:59211 "EHLO mail-ea0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753218Ab3C0VGf (ORCPT ); Wed, 27 Mar 2013 17:06:35 -0400 Received: by mail-ea0-f174.google.com with SMTP id m14so1530127eaj.33 for ; Wed, 27 Mar 2013 14:06:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=8hivRQvAxdfsiLuLO6WPTHDbf142aJcwaRhq4TnMAbU=; b=ZPbdPT3Y/yfEDgwNm+N/5JufXq1w51d3HG5I+p/b+gCeG4B8PiAPVD+88GR1nHLMrH 6A6O1ZpOwdoaMMi6OtDIrxWAm6/zjCE/uPXwQ6qqYzAEguG5QqEqIBsF0IQtmrADuTG4 Ts9bxyd2f3ZjyKjV5vUDgkBcotUDzALP7uYqvuvRCh6vgpjgzKziSOJJAZTDJynlWKmv 28eUENCcTxSGvlNyAtsiZ7iotAYnf1yeFjiTMarSt7X7pp1Y6G10ckZ9sZT1yEQUaAQV 1jNtTfLo3uXJBDPZRPlSFAp4izf1tJCs++0ReRhAN7mQwJYGarht/i2zWxosmGTLnxZk ucoQ== X-Received: by 10.14.0.73 with SMTP id 49mr59841563eea.21.1364418394325; Wed, 27 Mar 2013 14:06:34 -0700 (PDT) Received: from Athlon64X2-5000.site (ip-88-152-229-14.unitymediagroup.de. [88.152.229.14]) by mx.google.com with ESMTPS id t4sm33797582eel.0.2013.03.27.14.06.33 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 27 Mar 2013 14:06:33 -0700 (PDT) From: =?UTF-8?q?Frank=20Sch=C3=A4fer?= To: mchehab@redhat.com Cc: linux-media@vger.kernel.org, =?UTF-8?q?Frank=20Sch=C3=A4fer?= Subject: [PATCH 6/9] em28xx: move the probing of Micron sensors to a separate function Date: Wed, 27 Mar 2013 22:06:33 +0100 Message-Id: <1364418396-8191-7-git-send-email-fschaefer.oss@googlemail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1364418396-8191-1-git-send-email-fschaefer.oss@googlemail.com> References: <1364418396-8191-1-git-send-email-fschaefer.oss@googlemail.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2013.3.27.205715 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, CT_TEXT_PLAIN_UTF8_CAPS 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __STOCK_PHRASE_7 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' Other sensors like the ones from OmniVision need a different probing procedure, so it makes sense have separate functions for each manufacturer/sensor type. Signed-off-by: Frank Schäfer --- drivers/media/usb/em28xx/em28xx-camera.c | 23 +++++++++++++++++++---- 1 Datei geändert, 19 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) diff --git a/drivers/media/usb/em28xx/em28xx-camera.c b/drivers/media/usb/em28xx/em28xx-camera.c index 2e4856a..d744af6 100644 --- a/drivers/media/usb/em28xx/em28xx-camera.c +++ b/drivers/media/usb/em28xx/em28xx-camera.c @@ -83,9 +83,9 @@ static int em28xx_initialize_mt9m001(struct em28xx *dev) /* - * This method works for webcams with Micron sensors + * Probes Micron sensors with 8 bit address and 16 bit register width */ -int em28xx_detect_sensor(struct em28xx *dev) +static int em28xx_probe_sensor_micron(struct em28xx *dev) { int ret, i; char *name; @@ -96,7 +96,6 @@ int em28xx_detect_sensor(struct em28xx *dev) struct i2c_client client = dev->i2c_client[dev->def_i2c_bus]; dev->em28xx_sensor = EM28XX_NOSENSOR; - /* Probe Micron sensors with 8 bit address and 16 bit register width */ for (i = 0; micron_sensor_addrs[i] != I2C_CLIENT_END; i++) { client.addr = micron_sensor_addrs[i]; /* NOTE: i2c_smbus_read_word_data() doesn't work with BE data */ @@ -167,7 +166,7 @@ int em28xx_detect_sensor(struct em28xx *dev) default: em28xx_info("unknown Micron sensor detected: 0x%04x\n", id); - return -EINVAL; + return 0; } if (dev->em28xx_sensor == EM28XX_NOSENSOR) @@ -182,6 +181,22 @@ int em28xx_detect_sensor(struct em28xx *dev) return -ENODEV; } +/* + * This method works for webcams with Micron sensors + */ +int em28xx_detect_sensor(struct em28xx *dev) +{ + int ret; + + ret = em28xx_probe_sensor_micron(dev); + if (dev->em28xx_sensor == EM28XX_NOSENSOR && ret < 0) { + em28xx_info("No sensor detected\n"); + return -ENODEV; + } + + return 0; +} + int em28xx_init_camera(struct em28xx *dev) { switch (dev->em28xx_sensor) {