From patchwork Sun Feb 19 18:29:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Frank Schaefer X-Patchwork-Id: 39505 X-Patchwork-Delegate: hverkuil@xs4all.nl Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cfWEU-0000JI-2c; Sun, 19 Feb 2017 18:29:14 +0000 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.84_2/mailfrontend-7) with esmtp id 1cfWER-0001gb-3A; Sun, 19 Feb 2017 19:29:14 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751586AbdBSS3K (ORCPT + 1 other); Sun, 19 Feb 2017 13:29:10 -0500 Received: from mail-wm0-f66.google.com ([74.125.82.66]:32771 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751554AbdBSS3K (ORCPT ); Sun, 19 Feb 2017 13:29:10 -0500 Received: by mail-wm0-f66.google.com with SMTP id v77so10799650wmv.0 for ; Sun, 19 Feb 2017 10:29:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hBzI8/Bz62rX6I4Kws00emf9kA5soHS4VImuUtz9PXs=; b=o/0m3fTfFoumQLEZUBY7TOtcyVE+ojiOYYUz9Z0qXo30CPbtTCxRKVcibjnA2RViqX KnBj7FcSMlzIdM4kn2GXBPmFULGwAjToHx3fRGR/Td2nKNPZ3DrgFh4BAHfCb9RLXXj/ JJewk8g9gSpgjnbAF7av3XomigLMZAPL2TBUTdHJC94Ea54BDdbARNaAyAUSBKSmjodc muQmcTN0T7IKkHKxehlNGP6nKOoAf97CvXgl5SsOkvq7YkZkmoYiHqLETNZcZdZ5qfoQ nD9cU5pfvqxTirpE9uKEmrTRxpfehQQMAxNdESDWSaGSNzeKqftTBMOwk24uNpAluWTQ 8O9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hBzI8/Bz62rX6I4Kws00emf9kA5soHS4VImuUtz9PXs=; b=r3PCL0OxT+fsP2u6s4fS0qeLVMmHfTQNXfh8mGcPHCjZjZUmVGI3aktBfQjl+bzR+E n6o2u7SZkRqYvAqvSKAN6PMrGWQaaR6loRo8AIxmcjKpFGUzZJ6y014Au78IZDByczTW v7UvmMSXq9aTvIE6fuaoPsVFLASGxYxtBK2kUT1xsHO1icarQBPDmFg4tbZDtR+guJvC nO3HwjuHVnmmJxYOVOTK8tUU+V74HxA43tBnTeK9xf1+5eHH8n7L1BnWqGAB/DykMN7l Q/wJQ0AoDP/Lyim8Iox2HaAuQ+xXlotECBIOWmOc/30dXPDkvxORIFA1DHleLB4AoFtY FliA== X-Gm-Message-State: AMke39nrc1Ub7u4kX3lS53vLLBV89DkCPgWIvGDb5Gxsc/QPgMjhOVqvfr/W3c5Kd62GYw== X-Received: by 10.28.49.70 with SMTP id x67mr15199428wmx.69.1487528948457; Sun, 19 Feb 2017 10:29:08 -0800 (PST) Received: from Athlon64X2-5000.lan (ip-94-114-163-233.unity-media.net. [94.114.163.233]) by smtp.googlemail.com with ESMTPSA id u68sm10466940wrb.65.2017.02.19.10.29.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 19 Feb 2017 10:29:07 -0800 (PST) From: =?UTF-8?q?Frank=20Sch=C3=A4fer?= To: linux-media@vger.kernel.org Cc: mchehab@kernel.org, arnd@arndb.de, =?UTF-8?q?Frank=20Sch=C3=A4fer?= Subject: [PATCH 2/2] em28xx: simplify ID-reading from Micron sensors Date: Sun, 19 Feb 2017 19:29:18 +0100 Message-Id: <20170219182918.4978-2-fschaefer.oss@googlemail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170219182918.4978-1-fschaefer.oss@googlemail.com> References: <20170219182918.4978-1-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: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2017.2.19.182115 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, IN_REP_TO 0, LEGITIMATE_SIGNS 0, MSG_THREAD 0, NO_URI_HTTPS 0, REFERENCES 0, __ANY_URI 0, __CC_NAME 0, __CC_NAME_DIFF_FROM_ACC 0, __CC_REAL_NAMES 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_DOMAIN_IN_ANY_CC2 0, __FROM_DOMAIN_IN_RCPT 0, __HAS_CC_HDR 0, __HAS_FROM 0, __HAS_LIST_ID 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MIME_TEXT_P 0, __MIME_TEXT_P1 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __NO_HTML_TAG_RAW 0, __PHISH_SPEAR_STRUCTURE_1 0, __REFERENCES 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' Use i2c_smbus_read_word_data() instead of i2c_master_send() and i2c_master_recv() for reading the ID of Micorn sensors. Bytes need to be swapped afterwards, because i2c_smbus_read_word_data() assumes that the received bytes are little-endian byte order (as specified by smbus), while Micron sensors with 16 bit register width use big endian byte order. Signed-off-by: Frank Schäfer Acked-by: Mauro Carvalho Chehab --- drivers/media/usb/em28xx/em28xx-camera.c | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/drivers/media/usb/em28xx/em28xx-camera.c b/drivers/media/usb/em28xx/em28xx-camera.c index 7b4129ab1cf9..4839479624e7 100644 --- a/drivers/media/usb/em28xx/em28xx-camera.c +++ b/drivers/media/usb/em28xx/em28xx-camera.c @@ -106,8 +106,6 @@ static int em28xx_probe_sensor_micron(struct em28xx *dev) { int ret, i; char *name; - u8 reg; - __be16 id_be; u16 id; struct i2c_client *client = &dev->i2c_client[dev->def_i2c_bus]; @@ -115,10 +113,8 @@ static int em28xx_probe_sensor_micron(struct em28xx *dev) dev->em28xx_sensor = EM28XX_NOSENSOR; 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 */ /* Read chip ID from register 0x00 */ - reg = 0x00; - ret = i2c_master_send(client, ®, 1); + ret = i2c_smbus_read_word_data(client, 0x00); /* assumes LE */ if (ret < 0) { if (ret != -ENXIO) dev_err(&dev->intf->dev, @@ -126,24 +122,9 @@ static int em28xx_probe_sensor_micron(struct em28xx *dev) client->addr << 1, ret); continue; } - ret = i2c_master_recv(client, (u8 *)&id_be, 2); - if (ret < 0) { - dev_err(&dev->intf->dev, - "couldn't read from i2c device 0x%02x: error %i\n", - client->addr << 1, ret); - continue; - } - id = be16_to_cpu(id_be); + id = swab16(ret); /* LE -> BE */ /* Read chip ID from register 0xff */ - reg = 0xff; - ret = i2c_master_send(client, ®, 1); - if (ret < 0) { - dev_err(&dev->intf->dev, - "couldn't read from i2c device 0x%02x: error %i\n", - client->addr << 1, ret); - continue; - } - ret = i2c_master_recv(client, (u8 *)&id_be, 2); + ret = i2c_smbus_read_word_data(client, 0xff); if (ret < 0) { dev_err(&dev->intf->dev, "couldn't read from i2c device 0x%02x: error %i\n", @@ -151,10 +132,9 @@ static int em28xx_probe_sensor_micron(struct em28xx *dev) continue; } /* Validate chip ID to be sure we have a Micron device */ - if (id != be16_to_cpu(id_be)) + if (id != swab16(ret)) continue; /* Check chip ID */ - id = be16_to_cpu(id_be); switch (id) { case 0x1222: name = "MT9V012"; /* MI370 */ /* 640x480 */