From patchwork Mon May 14 14:53:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Rosin X-Patchwork-Id: 913016 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=axentia.se Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=axentia.se header.i=@axentia.se header.b="pnKfApa5"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40l3mT6n5rz9s0y for ; Tue, 15 May 2018 01:00:57 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753985AbeENOyN (ORCPT ); Mon, 14 May 2018 10:54:13 -0400 Received: from mail-eopbgr30090.outbound.protection.outlook.com ([40.107.3.90]:39648 "EHLO EUR03-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752008AbeENOyK (ORCPT ); Mon, 14 May 2018 10:54:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axentia.se; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=JdoxC8+RWPuV0BSDH2qASNlM7KNs9OlK48mkh9TyDyk=; b=pnKfApa53fjRZ5BV3sYlvfU/0et8qP9V3OFu26dP+yYXpcPMF0vj0fnM1UW1WqKsioRLaercBuUC7dUUALFKspFSrsWFCzNoRKIINSu3zhgvEh6DJnXUE0BJKwHv09kze8iF+WN/0Zzj92L8kJPiUAsRUgWHosDTPRspxLXx9w4= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peda@axentia.se; Received: from orc.pedanet (85.226.244.23) by VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.755.16; Mon, 14 May 2018 14:54:07 +0000 From: Peter Rosin To: linux-kernel@vger.kernel.org Cc: Peter Rosin , linux-i2c@vger.kernel.org, Wolfram Sang Subject: [PATCH 01/21] i2c: algo: bit: make use of i2c_8bit_addr_from_msg Date: Mon, 14 May 2018 16:53:10 +0200 Message-Id: <20180514145330.4857-2-peda@axentia.se> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180514145330.4857-1-peda@axentia.se> References: <20180514145330.4857-1-peda@axentia.se> MIME-Version: 1.0 X-Originating-IP: [85.226.244.23] X-ClientProxiedBy: HE1PR08CA0043.eurprd08.prod.outlook.com (2603:10a6:7:2a::14) To VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(7021125)(5600026)(4534165)(7022125)(4603075)(4627221)(201702281549075)(7048125)(7024125)(7027125)(7028125)(7023125)(2017052603328)(7153060)(7193020); SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 3:u7EF49DwTl1+PpBXqIYDel67pSR6it7GV3NOtyAuw9/5Vc/Oi/yT8AoOpx/MMbOsYvdSYHQmIL4a4qYaaz+A3AVVb6OEm5qAHZyLMVVd3d3/f2YuaO1iJal6EVF09mOfoI2Wqxv3XQdGh+iQ2qsIH3FRqmNRzGpPoLjU5lf5Q9bbx580LBECe1LPqj50SUWwHwPRWxT4eGFKtT5fr/VR/KN7wLeaUIkOt2L0H8P0Rh7HkNXKVNBkqYS+l0TdfRlc; 25:Lev1wpcSNhY0l165Jh6v8VoPXW1bCNLHE387fTlu9F0AbeYwi42cojgrfrmddyYBC5/kvwW/xVwYTL6zkCguOlyNcbGwgbyLMAET/D+zuQQ9KMqCrw3pGnD3aHUcyU47O3kpF242wIXMPmeKgfsn0wBU24jiY9PwRkmn05KXZfDEpWvXTXNpw2O4i9RDm1BX7w7eLIDAAIFFxrwqknr5SrDOdMCVExjMMQzId9LR1WzdcGMfzme3kjdSI3TOwww8DAmTQ6q1ejVdkR45CAyBt+MXGzp3iE9QH7f4kxZlvGEkfEapLjtRFZhwH7p81dLa+GC0ppNnr+rgqwI8h4VEkA==; 31:MPOBEo81kBp8+qpecSCBaZ8TGp8egzFqSLCmV4X0gD/SUjclB5xODkpueRhlDc+v994Ast+7ll3zsQKWHkXxvzkZ91HkGHoF3BKz5o8a0LZwXW725E5AYVg4IGaudQzQTkFicxCprCfqkA2+U7QHiOXZVQ124qQLkay1hYTXKqgMf4G8ZCouhaON/AfYh1cIT4A514SfOAo2PcTF7al/mY63GutdtHOYSpCF3IHnwzI= X-MS-TrafficTypeDiagnostic: VI1PR0202MB2782: X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(3231254)(944501410)(52105095)(10201501046)(149027)(150027)(6041310)(2016111802025)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(6072148)(6043046)(201708071742011); SRVR:VI1PR0202MB2782; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 4:FHYGq7wddCeNFWVn+6C608qNHoAd5QBS7qjtPQdJwxrN0byOh1f8MQH+a7rtG1fBA46GOU3zpwXjB7mflVJa7nbsbCRQPhech7ERJYH0IXGSSoGa+EH+sLJVXA++pKRV+ss3o+c/rr2l7S+AB2XCvipVq+o9Hl+GBvZKF7Ck6A2LaJa0sVuNZDtjp1o9EqOScKGw/hvAUyYCpGmlaTHlvqM3B5pLyVqGNUl0DXb/d/ZEPkvulcIFRCh+PBZJCf3oZa0IHR7IeeWzJNbQ5V/ZAg== X-Forefront-PRVS: 067270ECAF X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(39380400002)(396003)(376002)(39830400003)(346002)(189003)(199004)(48376002)(6116002)(97736004)(68736007)(478600001)(4326008)(5660300001)(1076002)(6666003)(2906002)(53936002)(16586007)(3846002)(66066001)(6916009)(316002)(15760500003)(47776003)(50466002)(54906003)(6486002)(50226002)(186003)(16526019)(476003)(81166006)(25786009)(6512007)(11346002)(446003)(105586002)(7736002)(956004)(106356001)(2616005)(6506007)(36756003)(76176011)(386003)(2351001)(305945005)(486006)(52116002)(51416003)(26005)(575784001)(8676002)(81156014)(74482002)(86362001)(2361001)(8936002)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0202MB2782; H:orc.pedanet; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: axentia.se does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 23:KHobnmirYS4rkBsf9Ui6DTFieXAASrAULnx/3nYKuiFVOevI8misF0JQYks0ZabOLPT83zf6UINYC+9pu1N3PYeVLQ+TXq1KmurmXt63SYpXoNASPv9FD5NutdvtfCytSuTsu7oVRo5ttOg3Ns+fhsJwoUo1XxgoJaV46vyg3qEBcbmxjfejNjUbpMgawrO509CnkGTRbg96hVrQnL6t5BT4wPnzFqyxTCplQG5puI2FMN7hKxMT8Hhs+BtVpM1/xmwHqgAocVgVrD/sYLbY7ZcpdI7Qan+hz0qwNm3R5IGrS7UrV4qfSWlBQh963lpP/Z5CUliaVjRZ5pWGPFXgslWhnPQFft4k+qLouj4DN1IlBW/Mw1u6uy39sRZn/AkRkzZXXt7mRSLIFQ6YPW6uyXguDj8by6kyI/LvfLdFYufeL5O1dhZ6vL9kjid96Jpw3eBRKVL51Qibcj6SpoeOIbxYgb6si/kC9DKvK6axHaeNwqv+c8J0w9Tt09fG7Yj+Ck+v+m1zYMj2i9U7Xb2Vzj5qwg8WkzE+Rta6D0E0Jcp0bdq7m8ITDYDi/gw2rEItC+uiAGNsyUC84DCaa1WVtSJ7cnHtb3aqdm8xqNdXFidSf4t4FH9fJ/MbxICKwxJmdVG8B16yfpBEAxuR/0aQZ3EjoI3L7cRt+O4WAWE3vlWNoleWgOTRIzFYlN0mmqkdb6n8X1ofYeIv8c+Vq+3ISYNs5pmXryAeIKyCGigCt5XoNkyA3MeC50YNLcUyk+Uu/RLokZfzd0pJFI724o00d7PZ5yoM7ogCaI5MaQlF6yBjkYDFCzMrYrq2Ep91LxBxQHTteUl+bUebsm6dh9hLbZBzEiQpcls2eUtYhO7tx0ivDhaiM8LO06/SSKUAQNITNGDYYqxpJt/9ReeZ1IAT6EjdmShukYVwPMJtWnlIYtnyCgcmVYq/iyPHebI9pl9j0X3PsA9nJsFehlpL0yU0h/CfL6VLaAPwQ549bmmSgEcRTbqupSPM/aZzc100mJIdCRBQYvO8Y3bcbE/xg4XtNENxzX5+McXUCgTPK3z83y6dARWu4wr0EqgmVA8D3iSATwMiCale+vhkothNGW2ONJx6cQDxaQ3vsu5fMpDWqegmrZKt0YsPMv77hbp4kbA4ZlgOtUwt2v+DYyDUPxttKKagNqOYXNTbnQ6AvSPY0pdMQYyuR0MqCvP0wa8dvoLJdj5DZ25YLIRR6ByCB+6uzBNodKkVg5p1LcrzyOEQ1p9FG4LxMQmlSv25fbLg1gtK6U06UlX3wKHTPdZvFyhV8+0aYYsUb0J7DRar1gJn7ofF8g1rqXpi/0E7O+Izq1NmcP3MiQb8/GPA+l4Wkw9BNQ== X-Microsoft-Antispam-Message-Info: k6c6gFeHbiFe14wOL71DKMacmpV4AWN4yJgVvids2wD9JSJ4HRztsSI7Z/SvnS1ggzyGHqogejM9tOhI1ixAez9lbYkBJLc72R3M6euYDqblvQHxjsUe+m45vkRYfmd9YF7Ck8TQPKa4eM9PvkdQsv/YhE3py1928bymE2RVIwE0eEzavBW6+u2fWNy9Gxrl X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 6:jMLEnUbtu2CNJx7jA2HfLxKt3IUAXmr4vN571qng1O1DkXzJUEPe8TOjPzR8GbWNV6hPlIUjWLRT6dXOYwqSeOu4V8DCUgRgJOCUncPHjFZmbPWVTKCWoHmAWQerEkpvbMBZyx40g873RvpRtniZN+COkUPR7FjZx5pvB/TANZx/A3UaCBdFlziqGknTzYvfJlSu7ikMzJAJk2yXo0or9i7iqmoNKcgZzv8K7kZyGKBmMphF+voVwe/QO9CxDPGIvxFbnnaDWDY+vCxaIyRdbuEvy0dmjDYa4BTK+c3Y88B2rObEkaDrtpK5AZupM3NWsPBbkSRXeVyrvxnjTNppCn7J36HHdgTEqXz+xkPx+FFgzlnJrlEjyu71fKfMVxzeCSxPLZLsdZmij2x8kZdH5KtPPIdE2NUgMiocMx0IDsR6BF5YdMEC2CqJeVyt6BChf3oSuALVLB3wPqIDf3F73g==; 5:F5beUvshbJ3+/PDZUjL/qcMZfGquQIEcl0/oswzVS7aVICIMLENa7Hr3sM20WM5n8OUGuk0+WAdWqZ8/TfAcAFk1+GKI/iaHEqgTKESavcXddNGMWRbRu8EOy+7l5b8UP9Ue/q+emAGNl+WCvoA8CD0hRfaHRwNzF1NxrMhFrUY=; 24:lenYTn+wG1a7yd0ocVEhYFdG70083iRfqaHnMqftoKpMIwupHsh65FSBGsZAN6v3iAj3FWo2HFkOhmA1Y9AU/RMXMubafInDUHBecXtjNTU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 7:bQB2Lvjm+eaIUvwFPcPqXFNcDtEIS+PdZJp/PqTH9ra3oJKPUwkXWmSGWVTxpa7W9QLh+mUX1gXJb5ubKrTP+IeT26O5X/fm9RipzN2IJnx49H5sDonb247fcRCYEn6gdXnvz8HJhULeXtwG6FI2VHW2mcKSGKurlNG49lV9diOZPGTfYc2xYJNmSfD26Nezsmc1u+fFrUCNnjHJC4bgmTwE6m+4g7YPXRDBkOh51oPcy8cXhLC8HPRhNY567T4j X-MS-Office365-Filtering-Correlation-Id: 04051fe3-56a5-4fd9-79a4-08d5b9aa8b88 X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 May 2018 14:54:07.5599 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 04051fe3-56a5-4fd9-79a4-08d5b9aa8b88 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4ee68585-03e1-4785-942a-df9c1871a234 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0202MB2782 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Because it looks neater. Signed-off-by: Peter Rosin --- drivers/i2c/algos/i2c-algo-bit.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c index 3df0efd69ae3..4a34f311e1ff 100644 --- a/drivers/i2c/algos/i2c-algo-bit.c +++ b/drivers/i2c/algos/i2c-algo-bit.c @@ -519,9 +519,7 @@ static int bit_doAddress(struct i2c_adapter *i2c_adap, struct i2c_msg *msg) } } } else { /* normal 7bit address */ - addr = msg->addr << 1; - if (flags & I2C_M_RD) - addr |= 1; + addr = i2c_8bit_addr_from_msg(msg); if (flags & I2C_M_REV_DIR_ADDR) addr ^= 1; ret = try_address(i2c_adap, addr, retries); From patchwork Mon May 14 14:53:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Rosin X-Patchwork-Id: 913015 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=axentia.se Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=axentia.se header.i=@axentia.se header.b="V6ORPhLP"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40l3mS6cRYz9s15 for ; Tue, 15 May 2018 01:00:56 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752447AbeENO7m (ORCPT ); Mon, 14 May 2018 10:59:42 -0400 Received: from mail-eopbgr30107.outbound.protection.outlook.com ([40.107.3.107]:37024 "EHLO EUR03-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751953AbeENOyN (ORCPT ); Mon, 14 May 2018 10:54:13 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axentia.se; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=J2gqkGUG4Gq0FphXPmSXXKXQ7yyVkpOuDSKJlMIxUE4=; b=V6ORPhLPe7caXMkz9gDsnVMPGyujFQypz7WuSim0IttpZ9CsXvS1/LtE2L+9KI+ceRCS01AIbG5+pttz20O0C5BzhBY0iCchEIahKlPmr7GdM/M2Q6T0YeWRp4uIBQ00e1dDFE9XnVBGpnDox8J46AGxSPeZx+lG+fXKUSO2yEU= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peda@axentia.se; Received: from orc.pedanet (85.226.244.23) by VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.755.16; Mon, 14 May 2018 14:54:10 +0000 From: Peter Rosin To: linux-kernel@vger.kernel.org Cc: Peter Rosin , linux-i2c@vger.kernel.org, Wolfram Sang Subject: [PATCH 02/21] i2c: algo: pca: make use of i2c_8bit_addr_from_msg Date: Mon, 14 May 2018 16:53:11 +0200 Message-Id: <20180514145330.4857-3-peda@axentia.se> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180514145330.4857-1-peda@axentia.se> References: <20180514145330.4857-1-peda@axentia.se> MIME-Version: 1.0 X-Originating-IP: [85.226.244.23] X-ClientProxiedBy: HE1PR08CA0043.eurprd08.prod.outlook.com (2603:10a6:7:2a::14) To VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(7021125)(5600026)(4534165)(7022125)(4603075)(4627221)(201702281549075)(7048125)(7024125)(7027125)(7028125)(7023125)(2017052603328)(7153060)(7193020); SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 3:70dEk2Sz7DX4VnL5SU0MSsjo2eNAAe4p8IB+nj5h5iM27rC6znBtQVo1e48uIcg9naDSgxaoQSQfbMOIcXaDyahcb18lvsefv9w99X70eU3kIYaT9q7UJhMmIthuS6EOQhL+Kd/MXvao3KoTuYfOUwB0m+JqETKoe9YBt6FTvZPDY3EYCxWVTX5LCnpd+ebuVPvCCDOT9I3biPA8wsgyyg4AtitOYHKF9HzwAeRukgGepVmD4UwjTDJpsj6B4O2x; 25:gme5T+BnIT83P4rXNp6RqyQsWcCwhaL81Q4H7qsPrNH2uqR8D/WsnBj2xwo2JVcsfDR7J5LdDewDl1gT3rFdoXwVCJp28ZYYxs4RYt53z/Ea/ufNzGEyxCRiFtRyllzh4Vh72eZOOXFuHDQwOmG7RtXYViujFvbzkAGBXue06h1GCqHInH+JAYQDJOysYHg4yg8r2SzyPuerhAjXL8g28H6s4VEhDSjffaUnGZrIjRWZTgK8WhvkIQ+pZWEGZJER/nEi6rMgtL/aXqtv6pOpcTNAEtq53p7dydlcGyGDV6F8vSsTAkrX2idA7bNUXQxlVz1bIdDvRunwPgwAPPVxxw==; 31:SF3dZHqhJvOc9t4F6zg0yJ3Qbex3UHEHnU3Ij1rV1/R6DBGhtT+JFg9WOjdM1DsDyn1aFpqA6sf3651HCxRzWit+9aY2f0aC28pxALTXnbo8JWmozxQ1ni75tW8bDRtHNkd9Pf/ITXSGyYcgrkEmQelzuywdCZQU7BS9gsENYnEgTf4ukyATC/H+1ZBU9dzxHcFZZypJK562HLasILKbYHtBB5KKmqoStbEbIdTmRIY= X-MS-TrafficTypeDiagnostic: VI1PR0202MB2782: X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(3231254)(944501410)(52105095)(10201501046)(149027)(150027)(6041310)(2016111802025)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(6072148)(6043046)(201708071742011); SRVR:VI1PR0202MB2782; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 4:8Q7qNfEs0KqG0G2L5rr14hK/evQVk3f3Qxs1X+A50McvDKGiGX9ASUzC4hh2qTX13vrk6yDnJIxZ9JHG+cq8NH8qflKN7KDFbAvSgrIDQwpkH9wUaVM69NWlqKAWE2OGMhVI9QJq06IRVKlRv90lrp49Vf4IUwlptu6/XrItOEInFTRCxSCqVNRElpqO/axicaXcHY+W0shYOdG4HN4ZuQrpP3KpbQgtT1ZDMU5Tj5MIuavlYz5idapx+N3bocWSkXY8UAfleUv4GZhWwBgSHg== X-Forefront-PRVS: 067270ECAF X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(39380400002)(396003)(376002)(39830400003)(346002)(189003)(199004)(48376002)(6116002)(97736004)(68736007)(478600001)(4326008)(5660300001)(1076002)(2906002)(53936002)(16586007)(3846002)(66066001)(6916009)(316002)(15760500003)(47776003)(50466002)(54906003)(6486002)(50226002)(186003)(16526019)(476003)(81166006)(25786009)(6512007)(11346002)(446003)(105586002)(7736002)(956004)(106356001)(2616005)(6506007)(36756003)(76176011)(386003)(2351001)(305945005)(486006)(52116002)(51416003)(26005)(8676002)(81156014)(74482002)(86362001)(2361001)(8936002)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0202MB2782; H:orc.pedanet; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: axentia.se does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 23:W+qRzF+8qqhAHMv/XBKMzKSWQ6NhBGuxmQxj/34+Wp2EbLMcH09Fn3xhHniHhG1EbuJqcyZk6ScvywJpfvfFaMd7Y6/7JGjl9SMtTijg2Hbn51fdhy2YOGSGq2uYDeM6C6RY1y8NkFtz5WCGPe7fCqK38+KhEnlZb/y+n/uk/d1s4ryMHPM6aGjZyiEJD2Tccn2lc3prXhFykpEsVo8jzPc72bYvKX+1hXbOeosMDHXy9tjzlhodKgihi8be01fQflOPyE1oWy3C/jWpmPPr8oJoB0g9fMBxAQiIRD6cMh3r2Icgo0CElHQmdMy4pn0Up7cADPa9EzwnfzDr8t7dyxH1Wavr2cYWRU4k7wT+CG513lVQKsU7li3hjdDJgNxUxwPHuIxIdNNrkUptpGKdsXZqD85idAGTk9NjNG01XZMmNz+9jv2IW1qXBbSFwJ0V3/vgbsdW0Xea/9Cho5jvKixBwX3ddIJHWBPGHDXJf3AYBK7Ozmo62MJukd2ePJetyXBJbJ37gT3a5zwUp7lcT83e4PwOBxe+qnuRgBWZNEsljcQhTFMspO23m0TV486qPGxMHYf7mm9gEk/3yOUa/SIcH54uKLyIKUvPrzFc0dDZ57L3NyMxP+gpaYy0WIDKYAlfBqrl/Bvr6LO4/2gVfg4ShRYvcpT8VyO1vyngOf7IKuL0RkH/4dtCPkIyXUoI62S6hlbmjz7GgTRO+7NC202xyVfNb4ZlsgHhyI9nTHr3TGhdWjEnT2mO4wZ0TReGojKzINGHVAbG8uToKolRZNM+bCzQ7Kftubk+96jeXbKurqQN+1OKpzopMemiMf92+Up1ugBM8sN9S8BQ9pKNk9JgFPOKDBgxb16mJiUwTsfCGIdTi8xGtEEtGf+WYQS+S6TSX0a6XYW26FX+mQlW5GDZLlApg0QDSfOGshQaTtjkrT4FAamjvwnFvxsWeO3zeQgM5srFneDQwKR+YuBwJXD4lq4TQBYS8nVs6nIKy8Ge4NVG0H3puafD61mbN6FqCk+0q4PE97Ql1EoXh3lDBZNT7zx5C5+z68x+nD85gS+ZUhv3CUVvJcT0RBxWL6FvTgvCuVdnLfLlYETpD2OiNPAE6kkEuyRqzUGRpZMWmWR8UVdU8EyQdOy5Uf6MHoWPy+YyHDZjqq+jXbuG0yHqSh+rQiaFmdWQbXmRs1C/8mRgtDqVeaQoAsf9NvfwWPGPqXDdTNr87aWBnYXjbGFhgNHJD4jchd03cfoQ5Wyn1Mke/1Sw1fWw5VD/95rteB+idojq5fKInSqG/X5uJCYd2+CPB0mxKuJ6nY3S8uKLu2I= X-Microsoft-Antispam-Message-Info: GLdzTj1bf0oDlWrgIynyWu0ZkyfcswOW7zX9p0lLQ1sfMHiU6BZP5Sdivp1+1Ug7Kb6GZu1AaKTXeEgxdEgX/A9LIr3XXWDt//olUAAYfm/l4seHQZe0NG0UYBiqndzGc3yt/ind08/qDt37P6F6WtZRXmFnzHRJp5xvsmwZjjUqWrRgNmn+y4TWup3v9YDz X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 6:8TuMuQZBXg3kGoVQFk8CKIdboA7dLrEHB11Ukc06/xKHVai01YlDKQn5vQ7g5zOWP6WXYTznP5mA8lSXnrhz3m+BlzpCaJ9Ug6bVfE3rjb9BXfYEPG86VGmTTuWBrUgDGB6Nf7SyGXaRQS/knJvaa7sTYdrKW2356nlb+D+Joapn3IlO9lC7woMbKOZfzddQVWmoP228kVv4wQqAb1j1ZWrQxOmnDuvgbc4XAk0GtIp/9Vw/uNgHV5d9ZH7Hyg3t1Hn2y0vMFegxzm4iORCLltyRrnW9qZ/PLJRNPE/3AKCTIMA4PmVVPv+5le0llFnjQIOthnZvnOE8TYE/HXHUbT3OHZHGz4oJygHIpyAh76hXrRY1FK8kJWB0N1YUyTP8Q2GOEuyLQd9yKgfIMgzvlw2LtVc3eI5wFQXCtD/Ok1qexvViHSz2OCB8S4XHlZkKmwaiYzmQkMtRb1jHnxVO8g==; 5:/YXzISRZzzMw2PHye4iHLXWFeaNAfzUFu7qzvN63lzhSVVW2pvPFY3hNoNkss63WsPtWUbk+CXYlLMiOP3ZiK0yxB0DgLO6PXJnbO65PgKDeV+Qzx9rTgJUTroPZhtIK7OB1ez+JzZj0Z0reTp+vXHSOEvoc/kWlAs/oBJypC60=; 24:sudSeJp6bB6OsP13DIp3K/L6SvRDSpqZ6AcgibCFYoBF4Kl+Eks2WgtZ2uBTEdtBRZmmpLrR3Hsuq6xgAOTaCFwjcR3aQW+HRzFpClLSVLw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 7:qDan/cJ/52uys3CfdI1UuTlWuSq9j8AyvCGb0IRGK8XSpjFYwI6+lRGuW0F3eNSW7lj9A5lhIFKVdtWXJxrqRiR7O0Kl031BE4J13sOcsmuuqtTK90V0v1G83ikx6hGVk5iS9meNNbEZ0iNRuwyaOZN4rvASzfV8gqACflBaVqBcUiHRFi0GZ9pXn6ZtpfYFIQsVOj64x78UGCNH3f3TKcNVmxDoYdsNC10AeBNz47Fc8m2wLlzFD7JJT9vKuc5x X-MS-Office365-Filtering-Correlation-Id: fd02e7a3-a99f-47ba-140b-08d5b9aa8d89 X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 May 2018 14:54:10.9349 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fd02e7a3-a99f-47ba-140b-08d5b9aa8d89 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4ee68585-03e1-4785-942a-df9c1871a234 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0202MB2782 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Because it looks neater. Signed-off-by: Peter Rosin --- drivers/i2c/algos/i2c-algo-pca.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/i2c/algos/i2c-algo-pca.c b/drivers/i2c/algos/i2c-algo-pca.c index e370804ec8bc..883a290f6a4d 100644 --- a/drivers/i2c/algos/i2c-algo-pca.c +++ b/drivers/i2c/algos/i2c-algo-pca.c @@ -112,11 +112,8 @@ static int pca_address(struct i2c_algo_pca_data *adap, struct i2c_msg *msg) { int sta = pca_get_con(adap); - int addr; + int addr = i2c_8bit_addr_from_msg(msg); - addr = ((0x7f & msg->addr) << 1); - if (msg->flags & I2C_M_RD) - addr |= 1; DEB2("=== SLAVE ADDRESS %#04x+%c=%#04x\n", msg->addr, msg->flags & I2C_M_RD ? 'R' : 'W', addr); From patchwork Mon May 14 14:53:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Rosin X-Patchwork-Id: 913013 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=axentia.se Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=axentia.se header.i=@axentia.se header.b="B+BNFMZN"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40l3kv16hSz9s0y for ; Tue, 15 May 2018 00:59:35 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932417AbeENOyT (ORCPT ); Mon, 14 May 2018 10:54:19 -0400 Received: from mail-eopbgr30114.outbound.protection.outlook.com ([40.107.3.114]:62484 "EHLO EUR03-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752008AbeENOyQ (ORCPT ); Mon, 14 May 2018 10:54:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axentia.se; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=5/NmO5RXPPLO55KfwqJ2jwex8ItsMJTQvBphD128amk=; b=B+BNFMZNnncliNZcbrqBeEx1sVE4YdYzGAhN4Y5rOefGWtf1xBm7SMJc+BGQlsTgl6j+7jYO/BsbPrVZLK1ue2ohBXpyRNCh2W6aOon3f5HyZV7pbR67+NxGNNG4BsDwlQwk9fSqRcYAkE0IUtxb50iKWsaEPNZ86NLCDuNP/Fc= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peda@axentia.se; Received: from orc.pedanet (85.226.244.23) by VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.755.16; Mon, 14 May 2018 14:54:14 +0000 From: Peter Rosin To: linux-kernel@vger.kernel.org Cc: Peter Rosin , linux-i2c@vger.kernel.org, Wolfram Sang Subject: [PATCH 03/21] i2c: algo: pcf: make use of i2c_8bit_addr_from_msg Date: Mon, 14 May 2018 16:53:12 +0200 Message-Id: <20180514145330.4857-4-peda@axentia.se> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180514145330.4857-1-peda@axentia.se> References: <20180514145330.4857-1-peda@axentia.se> MIME-Version: 1.0 X-Originating-IP: [85.226.244.23] X-ClientProxiedBy: HE1PR08CA0043.eurprd08.prod.outlook.com (2603:10a6:7:2a::14) To VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(7021125)(5600026)(4534165)(7022125)(4603075)(4627221)(201702281549075)(7048125)(7024125)(7027125)(7028125)(7023125)(2017052603328)(7153060)(7193020); SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 3:UybLdFGeceoN7uuZEold0WkP4t23G95rnRtOUjN5xy9O/6Shml+cm7EUFRAi0suyAnXSDsoQfusovWTluhkiqWnQoBcWbnFa0FYwahLWlZtUA5HvyKODm2HGdDC49NuYw5SjHF28/LrC02pm7etwuB0Xb/UEtQ0s5LuMZ6vssWWVQQt0BlAZ27POj90y7UhpyI4qlUWQcUSDRPipTo4EfZGcjzJXlC9W3crMpGM7PbrYJh3gH8tXy9bMI8giE7KO; 25:Gh5zdVnS2VgQWL1lSFvqaBWiHNxlkSoqhygy+E0AlKw3h9WMY+pg14gAH8bo7wrCanDOx3CBZqIFu34T4fvp4olbZxkGqpYxLrPspJ+BZPQjvuNoqjJc19or+5ZMuawEM6xmXmvRF1NBEmP68gNv2ItHp5h0REp14f2YOt0eAraG/xj3zpYhVgBq2ptApPddlKhx7hn8NT2JTuqQIylvqyAi2hVSktRjf2/gd1caQXcz3awYkQa0QF3WVHbbFc7sSNNdQXfcOqOw+PYT9amsrnGUv42/aJiuQWqEaircoDHNKXSm7viIfIGf58I8IXQzxqBUk9cv4lhZ8xZRBNOmpg==; 31:EW67W4uBFbrowU9QkL/pAofdccThJnps+uBhRzqXPtM8abLLTC16nvz2B5nJevLvEqCB7N4ZSSfDiuYq2eMdCPPvo+dHcSNgKNRxTZQ44elvv/hedZf3JsP7tYXpslL0po4NNzy0sRKfOEoQY6/+6i38IQAyzXzJErR1NhhMdgmVZgLat5NmCW5A/l5o4OYTHlryvJDEa1sWuXBIoqRRXKZfNAKITty7O5yJKqxOW4k= X-MS-TrafficTypeDiagnostic: VI1PR0202MB2782: X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(3231254)(944501410)(52105095)(10201501046)(149027)(150027)(6041310)(2016111802025)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(6072148)(6043046)(201708071742011); SRVR:VI1PR0202MB2782; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 4:2BRi0+SO7yV82150EUl2aY7xMLlDlKliBVVwLrXKeUKXx/umSSZXbRI0FU2lWGH7nXaEp2j9OmGgA5lLylXbkqq4YUO9LGknUnT8k5kZkfeJOucZGU0tWtqdcyXsNkDO1sWobTMC3eEQMyFPUZT2avjeNAgpfElRL/gxRsh5Cgl3GyS0rzSy1rGFjCba7qT5MDc41d+v/qnj8RsG6iFsosIhNot8klzmP4t1EQKSCA6ZZLWAOy3PwYVn8IfesCnwzwC4ZzcExD8QXltds+cPeg== X-Forefront-PRVS: 067270ECAF X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(39380400002)(396003)(376002)(39830400003)(346002)(189003)(199004)(48376002)(6116002)(97736004)(68736007)(478600001)(4326008)(5660300001)(1076002)(2906002)(53936002)(16586007)(3846002)(66066001)(6916009)(316002)(15760500003)(47776003)(50466002)(54906003)(6486002)(50226002)(186003)(16526019)(476003)(81166006)(25786009)(6512007)(11346002)(446003)(105586002)(7736002)(956004)(106356001)(2616005)(6506007)(36756003)(76176011)(386003)(2351001)(305945005)(486006)(52116002)(51416003)(26005)(8676002)(81156014)(74482002)(86362001)(2361001)(8936002)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0202MB2782; H:orc.pedanet; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: axentia.se does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 23:3CTEFR5cYt9kJNQlcroAqCrqPbwkj2H1vUm8pqoDAHLt4q8PO1/sb0ugwmYs/N8dm58dGPdkB600NstNXiTko80/HrNvVI4ZEH9XpJ/jePxtC+/voFIDHStVTMT4kkfHsWacGiiFfYlKXFpxV8joF593DVDcCCcyxgYfatzBL3e+RcQbsLBKo1EgYqrEg4KO2iwqb8VaKi+GtCmMsmcR14/LrA9vTy8TV2E48C+fYJ2PnwxOpcY9w48oAzHIG65/jZuDPwO3ew/iIBLHTiPpr3QK1eNCzCRTprNrkvmRopeYomJrmgXmooraK065AsFCXPWyEAjFUGmzO0IYxh1j3zjtarRHKtqASLDErS/MoD6WaxQ8ybv2cQLKqeYAcJYrNz16oxGGcueAqvuWnl1ktEC5iHtjsfEYDiF8wPsvwScL3QjUAPYNpB5bgycVS7bqxJr2N6sU0ZKdu81xJwtyFoohmGrGOfV22Qxbdbl0klbqIK91zMZmiYQTN0bO1N7y72V64Ab9s/10SVvUnfxT7cO8SpdCc1wgUVbtpNZdeQxkYeItfyOKok0t/onDZ/UkQOqDc96btDWKbVfah9me1WEvzByhsDTkltFVHs9syX4BeroAaG9kd+zr0NlaDRzhLeITueYaUWVMg2AIm+Goq0GkquEbJlZxTgr2ogeoQqJelvHxbBc+2cFUjE5b9KJFaW+jo/jrbFd0YivgwWYwF6dI7WEXwV/bzecNYqI8K0kaDf4GMNaLzig8jD7xCqUo/0Xrlb/fPDGuE5h4rkRwlqAFqTqgvA9r4ez4S//XbHt8fhoP79Q4iC6uItETkH33rSY4WHvHCs5RbQp05UY1RcD/IxTIOTMonb6rbvDbVvGDVQtWrNtPbgEQcXodeSSE5YrtsQPPzZAjns3EJcvBJSa2bvXTkuaDmiEOf8GGxqaQfflvn+YLCVJk3sfIja1WE3APt9t0E/K3dpSizZK0k4gXXXptsgKOBJ+kE9s6823zBlNiQbiI4fWc4LI9Uq3iC8AItDLIPHItuhKYf4QqEGqEmqj5NocEgoujgltsowPVIUCZdrHPytErE5fjDtYK+McmsVZkVW3m37F0IpKQO3kWeq7KltnvJzhyiHw3iLKBJkUdVq7X4WpFQL75aUsa4WhPKCvniib4KjnLOBOXPcElOurfmby+KRwLe3kpusOAwBB/Hjqu8G6hnQtr3MlHwEdkIeyg0Qac6fYxCx5ZWHfZ0rI5IXf5D0TCagHm37DyhYTTo5PZJv1EaW+wIVJEoNeNDKkGHWD47Yf0iekijPVT3o5W+rZ8OCAHgcykyWY= X-Microsoft-Antispam-Message-Info: 3m4Kk0xcHOBa7RqMpYLViTG7u/k8qoE+X3oMnF4LCM/dSUy6VK0oJVBFL/IW2/1R8jt4dgVqC9jvB01NfNGia4FHI/+oS+NqyyKXwcGAx+9V0QOYECRRtRzao49vxymlZANbxnPXDhe5tmpgyLhXL5/MUVkyAIBECYbU9goN+DDURzbgTHkIW8Oq8+0ZSrmn X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 6:8SQOX8pwoxFao87qnfn3Ok8WDSGv+/8ORS6r1MlUPtdhooa/h5ZjaNJI/35b4qpgb8G7RIhxroXCzrcNAb2jeL1CKN9tUTZ3pmUiDotuXdSailWjoVKpqWMEvnxHUMsV9rQ1kQzt20nmTiEcy1bBYSwDalM73s3UJOZsaMXLtQSjEY3BXRf32Wf1Yn+rWCutBbToijup7yag/0TYvgbMv/C83adT4b9F/UzOLfSxteNECfM7EUXqb9tQjIoqf9zQ/aCg8HtbTWRwqZCTV8RjaLhVVRCre8+WlQn0J63O2PX3f5P0a53s7ZeIvfnuV9lTKDEXvH6Zn6ei+OoI3nNpzscweXx/nvQWVJikhS7CHN+pa3atHhtldksl77Vms+opxOLTqltiz8Or9dDHoIhhP/YOhZ3imeFgM2/BrsiTrSPf1x2DDxCQQMx4MMd2ssSSgSYc7/C97MtcUPBlHlBVNA==; 5:Y75XOSo+cc0RoMPswoKq3syxDevDuqblo4XgP8pD1GRKkWH0Ex8/BMZyRmbmpd4ktEy4BDq7gqZICI7MKYp+pINW6Egkn1uaem4G/a4R4glRamvk+19wG+HF6gPTMPhcrpuyRks70I6X0Aaz/JcUTZcFw4M7Le1Sk8imw1ZUJiI=; 24:cd2jW2vFo9WhO75LbFgcv/hvFLkX//UdDrtfsvFcPqm0MLZI+3SIA2hQOPEBuIa6szjZ3XWOTJXAp0vxvgHtjJwRQb/cIwSc6e8v97G7Fgc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 7:pitrE6+o3Yd2SCP0RnxeQTBkQUBxxsnJ5S+HDEbYf2ETxgUKEVyqyoIB1paEKG+B+8Vcco+Oqg+oWVFhQMBk6C/pR2sG+1pmtIKweOV1RYlY/1b3UzLzA9ZnoYumkKOy6u3dCDeNfs1jz7lrb0aN/z2aLkbvuU1OfW//PAQj7lcSBO3e1C9W1YQZsc8THU8rz5l871N9zps/5IqdwHrrcIWIyxVOCJNP4CfSVcL7CeB/zgPk3Kc+RgUdiogWuKeq X-MS-Office365-Filtering-Correlation-Id: 9ad1f884-95ce-424b-c405-08d5b9aa8f5e X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 May 2018 14:54:14.0130 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9ad1f884-95ce-424b-c405-08d5b9aa8f5e X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4ee68585-03e1-4785-942a-df9c1871a234 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0202MB2782 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Because it looks neater. Signed-off-by: Peter Rosin --- drivers/i2c/algos/i2c-algo-pcf.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/i2c/algos/i2c-algo-pcf.c b/drivers/i2c/algos/i2c-algo-pcf.c index 270d84bfc2c6..bb60c1bd1f2d 100644 --- a/drivers/i2c/algos/i2c-algo-pcf.c +++ b/drivers/i2c/algos/i2c-algo-pcf.c @@ -292,11 +292,8 @@ static int pcf_doAddress(struct i2c_algo_pcf_data *adap, struct i2c_msg *msg) { unsigned short flags = msg->flags; - unsigned char addr; + unsigned char addr = i2c_8bit_addr_from_msg(msg); - addr = msg->addr << 1; - if (flags & I2C_M_RD) - addr |= 1; if (flags & I2C_M_REV_DIR_ADDR) addr ^= 1; i2c_outb(adap, addr); From patchwork Mon May 14 14:53:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Rosin X-Patchwork-Id: 913012 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=axentia.se Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=axentia.se header.i=@axentia.se header.b="oF8FbeIy"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40l3kb3Nwcz9s0q for ; Tue, 15 May 2018 00:59:19 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754185AbeENO7S (ORCPT ); Mon, 14 May 2018 10:59:18 -0400 Received: from mail-eopbgr20090.outbound.protection.outlook.com ([40.107.2.90]:3416 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932415AbeENOyT (ORCPT ); Mon, 14 May 2018 10:54:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axentia.se; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=jaLo4uMF+vNE0IbtlzldIm4j5w0JJdGkYSeCx+u8P8E=; b=oF8FbeIyyh7i291BJoI4chnruhoFIaRAoTM0tI1PUXUU7ySZqwMcNsd6+5EF2MdIyr00Ci/Dfrw3/usLVw3tTOdbW4yt+dCNU+f2rwYB0X7rybzFHb7IWZN8hftndSCC9vF8+HiQdWQ3onlQiN8JNGyyUyBdZSq3AHyh9ddd70M= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peda@axentia.se; Received: from orc.pedanet (85.226.244.23) by VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.755.16; Mon, 14 May 2018 14:54:16 +0000 From: Peter Rosin To: linux-kernel@vger.kernel.org Cc: Peter Rosin , Brendan Higgins , Benjamin Herrenschmidt , Joel Stanley , Andrew Jeffery , linux-i2c@vger.kernel.org, openbmc@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, Wolfram Sang Subject: [PATCH 04/21] i2c: aspeed: make use of i2c_8bit_addr_from_msg Date: Mon, 14 May 2018 16:53:13 +0200 Message-Id: <20180514145330.4857-5-peda@axentia.se> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180514145330.4857-1-peda@axentia.se> References: <20180514145330.4857-1-peda@axentia.se> MIME-Version: 1.0 X-Originating-IP: [85.226.244.23] X-ClientProxiedBy: HE1PR08CA0043.eurprd08.prod.outlook.com (2603:10a6:7:2a::14) To VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(7021125)(5600026)(4534165)(7022125)(4603075)(4627221)(201702281549075)(7048125)(7024125)(7027125)(7028125)(7023125)(2017052603328)(7153060)(7193020); SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 3:X7Z3sStox4t+sLTRxaJ6e9f4ZqMsFwN1aQmuRnx6L/d4/NgDUU7kYwcIrmdNL6Q7HidoPl7We09p7oDgn0lpn7uO+7/v5dVjLbTanPEUvnESt5HA32geX3vV4wh2mD9nyTjiztTz0KxuDzkRwGAcg8GxTc2MUlDWqSaMTK7dpIvN87wG67hvv4B0d1a95n70wziGvCq+DuFMtTXjj9X5POQTY3s57Nvjm23yOmLfPNEh6A9vsAdC0ysNKcqlyCdV; 25:YK6ULX0sECz6l0GLfEHRAKT/JrgOkndCawwzY9ZiYD9A6l/q95gwWrFDNi2uHfZk7l7abPrr495VkNBNgniQFNEDYf+hjV1OFNR40QX3EVIeGqTl6HQ1YvJD86NQTFsycII08znsMFeB27YpAb0YkbhHhsO2nHX567hHE2DWBYBKQ02XQD8Qnl0nLIheYUsXaD65rkKMmeDNrB8pFaFNhwjogolixp1VrFu/IAB+0ZPBkP6Aos+HLaMvu66I3ML48H64TzvcyKJVDqypzoXSEpLTrt2VrsDzBG5vyqluXfW6cNkNzoXpQzD4SmYQnAoMg/Q04tjTyITbqpyJC69hvw==; 31:uBQLLBIpqiw9xJZBISKkP7WK80E8lge/rvggMqQgg3Y4D3DaVeViLnJlcOI9ZIK/ysVcBp2GaV/L36vb6U8db2lEezuNqVlUj8iJl40BE+HYV2MXW4n+Y+LUG8TzMzoWJiJxQCW6CDLGqMhJnc+Zv2lNoaazO1SAZ0csgPAwZyBpqxVVNLrQ4Kw/sqkDGmcAmUWX+epgOMjS8WYDKDdOOOhffC1weVtjgR2Ab0DRMQw= X-MS-TrafficTypeDiagnostic: VI1PR0202MB2782: X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(3231254)(944501410)(52105095)(10201501046)(149027)(150027)(6041310)(2016111802025)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(6072148)(6043046)(201708071742011); SRVR:VI1PR0202MB2782; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 4:i45CPtHY+YSjIzKRUVNWp3eA9QTL7P2ZUeAQkIkq4MZlzosKrfwcA3wLpmTlMH7s2GotdoAie0jGsnuzBOV9CXdLEmVnhRbYWJe2KtrYwkADWO/Ru/aHPpMgq80GNvdyW0JJmAl6byNPKndeiZm0yx1iVYkt02kW1Hm07Vi16oyVGVBnRTp7eOjiWxqypPHpjECraXuHPK8/aKpyAWXl5sK4loDnWqfCcPAQ3vlWM86jNNI6tX/dz9YkuvjwO3XTGqK46M7+GfVY6Ew2iDOGVA== X-Forefront-PRVS: 067270ECAF X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(39380400002)(396003)(376002)(39830400003)(346002)(189003)(199004)(48376002)(6116002)(97736004)(68736007)(478600001)(4326008)(5660300001)(1076002)(6666003)(2906002)(53936002)(16586007)(3846002)(66066001)(6916009)(316002)(15760500003)(47776003)(50466002)(54906003)(6486002)(50226002)(7416002)(186003)(16526019)(476003)(81166006)(25786009)(6512007)(11346002)(446003)(105586002)(7736002)(956004)(106356001)(2616005)(6506007)(36756003)(76176011)(386003)(2351001)(305945005)(486006)(52116002)(51416003)(26005)(575784001)(8676002)(81156014)(74482002)(86362001)(2361001)(8936002)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0202MB2782; H:orc.pedanet; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: axentia.se does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 23:Y2ds0rzHqTDfMjDkELPZzM63jkjxb6bU05X/1n+l8MCs11LFzFdhideQ+HBs2QyOPxomuJVjZJbDjQzHbjwj0CovC3KaTJN/fKJVU+B9NFSh90mFZB5rWJFxaZ/3LTH61s1/1JtmrO6Sd5iv5EoPBSRcb0/eaKhNoCQ2Agb55r7kO2w5kMt8q6i/befFudd+git7qHVGGeOt8qfm7gLJJDj61yQ34uY8bFPrLSsUhHDSLaZMe70Bvu/68W1773mlc1dB3ssKy5qkpQc9rASs10KIwgC5thfDNL1lwyE62VGuEuZiKiXqjIsqQp7KIweoGr2fknf66X+XCcflBLLGu+c3pwbBkumi3JJQ/7KsdXNXWEzFxMHbcHuFpeMrxN4RkuKLTaVMYc9ujp/mZy1yNmm0OoZe6GOr2sg1i7ARCoFbKiMD1x2fZ7HtHcXqpvDFeukmNDshGI7vULKN0W+9OC3Eifg+gxUyFoI6DgRcXR0jBG5JnFJOqEN0a8fGy+RvqABdznPMECbVpLBey2Jl9blexDUssMPsKQ7GE2ZTzXYbcwT68llJivmx9x/iXNEIlf+OfBdim7XiMaoLkmcP+CJq//roh8KJwhHFwu8nCTQ+bv8OzJbgVTLCTJAbFgVoBYj+02Y+4TFA5H5Cz67LplSvivY/59NJOtbMYcmc+w/Qsl6Jqr3lEn8M0oDHhtcIc9KOF2HdSVxMeW6U89aSkaYvrgd4iSjusDXBI1u9dyyHhUm0G37aJTYxJhXRPDHVNbO7Z1OGIWXbN/nHm3eRqJ4HPimERRHcpj5JY4Wr+2ZZRIXBNND6s1TJwtNw3+niCadiqzvG9PsV2ZSfJxyIDt2iOEf0Y2K50e4SYgo4xdNmRi+sXauJg/m9Y7Mpao/H0oBOjsIX6pk2WcxkNDdRyrorWBQl6zmFh1nEMoGugxAFCRyALqiTaLrbFuoCDwEg8Sw3VGIi4ro+7oT2KFJ8Z8X6sqvCe69LuAiz38c9nhXxFyG5xFESxBJ1BS9PSkQnUtpQ1JdY6E739rZHGzdcNHni2vA1raI5OIyTe5Im2Zl99mQjgRgEulXaTU08ulXU8ODkto79wgKtcAXWPvyGmhxWdU5oqm1MVhqNQ2upWUFJl3YEbQnI36Qm1COvR7Hjv5ufjEABr+PRWuLxzMGDjKXyV99FzQnUKW+x8H8/aKa2TTaOaZg4JgJZg41w3PPlnQQV7peTi5d4FUJNqPQk8i8dkYAz7tAgs7yER/S/5MbnJlCppNR4G5jB+m4YWixTbeh2vtwAPnyfxg14OC+s8H6F4dX9DbJX6f4goJLKU39+ll9BCRc4IOoijHi3xfLjisbSInSd1G7JS2TRdwkPR2pcaYk3y2qbGG/0nDY77YY= X-Microsoft-Antispam-Message-Info: Gp7+xWoFn3hvEDjQy1UVxD9VsAXp4Ysv0iOmm6/1bceGkT9ckbx6WEYOpsS1cHf3e0VxoiDPDvnavq9RGWsklo29KlE7KSjLX3j8KEzv3NMh2REfkax+c8fWI3bsEFk3yaGXcrx0GD/L2rIUXtnupeWikq0TG88cpfwOOq4p2RX+ZsnCErIJ/KmpblHx0MA5 X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 6:paLvJxlQ+hR/l+d2jcMfYzMfvCw7Jv++JzOKSElywFbj2x7lzYjdXrge7Io7cn1xhXr7SlJJhphesDbD4RhmP2yJV9DdlKfdaOiehgkNnYhy2he7zHTyJV0sm06Mm9LIq4ZtKkflJmsOGL1n+b9SuxXRkmNstaLEMlIfmUY69bk/ZYMYBShYfC0zJkmO4q1uSeLs+OsBtr996Xn7pkFFB6XQLXME83KUmnIqkKRSQ9bp/sn+51hLB9tsgzpZkmtyk6GIEcDski6H5Hr6cWsGaYd91waZIGVG0cHB59HjDRVHeJiUphug6vij/+6Qt9CFht7/OyzvTR+xtg5VmwUBKvSJYsd/cZ73hebYMOdwLZzG3sN9wMDRaVXKKbbdMu787PBCy+LXFexA6TbvARVXhX8ozeJ7+tMQRyoCeo0IZ+V4PerbOK6OVX1vpCxZgjJvVxiXYdJ4lundlQJ3D2/92A==; 5:u0NphFsBuDkbUsGjJLdiRrI29tTJWEuprvVH3nHP/l03GYfSa0tPpaSKxcuXlG26wDLr6xpNr6G4BP/aBMNsXZYoU2AsNeDn3wnivegpn7cz+2sOsh1VVbWNCxmsHbgy/BQ2EpMHp4CIW2NnDTFR1y9WhxhB9ji8XnUYZCIBZsI=; 24:JIH2j+f4g8vMrD5Sl/+VB3z54rRB75wdZS5DHZGvAnnQmlcfAic/rfRHu66UNKgDhbGAgMCunbW+YX38904MP9ub7AV1vDYs28bWTFt+qro= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 7:KnSCTiMdDYtXxPdkxyD+HJHrMcYs+tWwy8mXacy/v1c5ix2+e0GYyVDe2P/U17yH4vxW9AgN91jTGbFBrhlJNkjR5ptvX9Nm9VKC7/7n9Qq9Zgmq3ZDQz2PcmmcekBVkDL0NtHajn6MJK0LyeY4ps/YvEn/dCpLfNEn4o4vzNs2JROm7Rx3Moo2bxOvGQtsM4bFSdzRyAmluwYUPjJjjxtTwLfoe/ZPF4OOJQkV99CWkKh8V9gmy9v5B7cT1dzHC X-MS-Office365-Filtering-Correlation-Id: 131a0c51-efa2-426c-3a13-08d5b9aa911a X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 May 2018 14:54:16.4505 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 131a0c51-efa2-426c-3a13-08d5b9aa911a X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4ee68585-03e1-4785-942a-df9c1871a234 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0202MB2782 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Because it looks neater. Signed-off-by: Peter Rosin --- drivers/i2c/busses/i2c-aspeed.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-aspeed.c b/drivers/i2c/busses/i2c-aspeed.c index 7d4aeb4465b3..60e4d0e939a3 100644 --- a/drivers/i2c/busses/i2c-aspeed.c +++ b/drivers/i2c/busses/i2c-aspeed.c @@ -335,13 +335,12 @@ static void aspeed_i2c_do_start(struct aspeed_i2c_bus *bus) { u32 command = ASPEED_I2CD_M_START_CMD | ASPEED_I2CD_M_TX_CMD; struct i2c_msg *msg = &bus->msgs[bus->msgs_index]; - u8 slave_addr = msg->addr << 1; + u8 slave_addr = i2c_8bit_addr_from_msg(msg); bus->master_state = ASPEED_I2C_MASTER_START; bus->buf_index = 0; if (msg->flags & I2C_M_RD) { - slave_addr |= 1; command |= ASPEED_I2CD_M_RX_CMD; /* Need to let the hardware know to NACK after RX. */ if (msg->len == 1 && !(msg->flags & I2C_M_RECV_LEN)) From patchwork Mon May 14 14:53:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Rosin X-Patchwork-Id: 913010 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=axentia.se Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=axentia.se header.i=@axentia.se header.b="qRDgJhoq"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40l3k45MYRz9s0q for ; Tue, 15 May 2018 00:58:52 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753998AbeENOy1 (ORCPT ); Mon, 14 May 2018 10:54:27 -0400 Received: from mail-eopbgr20090.outbound.protection.outlook.com ([40.107.2.90]:3416 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932507AbeENOyV (ORCPT ); Mon, 14 May 2018 10:54:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axentia.se; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=GhpjQqt7+Wos82oVh/t2MXmpm2DuqDcXDWp1JSU3l+U=; b=qRDgJhoq0J+sSSvEVAdEi3irKMkv80zEj8XTpxXU/gn9ASwsOVPYJLH17syAX+EPMojI26eLzfzsyuxj2oQ2HI5tQ4DlnFbtgMBJWSFs2kqcyZGG6If71NE1tJrauxY5ItATYo+9Ajj4b+MxImaDtuqCuOwXoACKxEKlvrjHNCM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peda@axentia.se; Received: from orc.pedanet (85.226.244.23) by VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.755.16; Mon, 14 May 2018 14:54:19 +0000 From: Peter Rosin To: linux-kernel@vger.kernel.org Cc: Peter Rosin , linux-i2c@vger.kernel.org, Wolfram Sang Subject: [PATCH 05/21] i2c: axxia: make use of i2c_8bit_addr_from_msg Date: Mon, 14 May 2018 16:53:14 +0200 Message-Id: <20180514145330.4857-6-peda@axentia.se> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180514145330.4857-1-peda@axentia.se> References: <20180514145330.4857-1-peda@axentia.se> MIME-Version: 1.0 X-Originating-IP: [85.226.244.23] X-ClientProxiedBy: HE1PR08CA0043.eurprd08.prod.outlook.com (2603:10a6:7:2a::14) To VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(7021125)(5600026)(4534165)(7022125)(4603075)(4627221)(201702281549075)(7048125)(7024125)(7027125)(7028125)(7023125)(2017052603328)(7153060)(7193020); SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 3:RuELxTSSXfK1PVPHh11NKyqxdOZHfGUOBtyU0rDn0SJYXG5xiAk/RZlO6DvG6XxDTBouarpa8rTBXKIIAsmGassV3OdIpSy7sCGb8MdyLaLfqchABh/XKDEaEdzMSPsVhpP+Bi9075pSTKJ6/dQxuyVlzB9k0APzz+Qj8kAoSemoZhDG63N1za5BzQiTERwl9u53fs0XYWsDIKGJIO+tjvAH21//7zUT21XL5Y+PBECIFeG8xL7dGlQMlgiXdaE1; 25:WgBAbmS7n+VCzExgJmrcICLC+FClG82KRasEeUR9O06bim2M5EeTry23sH7H59CnALOObC2vrqSIV1OwfI2xw3Va2ieeFtu64qtGvCnAYeWguiVa3jIbWiA7DZ7p7QOoOc25sEjElTWbEhMmM2Oy4x4zVyiYPlpi4ETbcFqEPrX8NFbkcbe/WFQzkubr3fBlCozHnZv45xxp70vLD776IIe4vHz9YTX3BtlnR3Rw59KHG8TaFTI2DYj+TBgDh72+Lt3ipKjGFZW20YXBUdZJ5LglXVEtXCHces5gPwIIf9dfyKYFhoRftemJtPocX6L8s4AqVZ/LRc85EcqzCyWb0Q==; 31:QKYkvc3SmEbOUkds/nK+JgOXBv7fUDv29nvKeV11wBKTUERKXN7XIqc6lp6z6/u3lWtEadhP0+MikovN3hzrVn9CETMKiNoIET0IXBSFm8r9s3ErixhSBWnf0yRLU5JkqYVCi6R7618ZFiSHrNtMqTR8OUFqh96Zj4wtLnKutQPYuRSxGXHm89Sh73Eb2cP+bB3+4J1uuIRHO8Qr/S3q14CpyyFLPoPVeLXZCBlcaSE= X-MS-TrafficTypeDiagnostic: VI1PR0202MB2782: X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(3231254)(944501410)(52105095)(10201501046)(149027)(150027)(6041310)(2016111802025)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(6072148)(6043046)(201708071742011); SRVR:VI1PR0202MB2782; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 4:oPf/9WdecnoQ+qyiUjv7KEllz9QaYHrtNhq2ElXX/uqQ6amxTQ1hBZcZhXQZ4QjM9eIn9JXna7QJx1OofcUPPIjFXesOFo5VpD+aoBpmo6WKLCiCzk+kDGD95JyTE5STwVHHgY217udnO/aJHaFCKSquk9zCjE+e9AdZlyyopL4lxpw74Q5qfRByVCgE7TXyTx7R+mXKCPpqTU9UgvJdlhAxZsSmACwz7D8sfob53VOOMUEvKJjCLLb9/aVQTmmKfkMnRJ940Zpd77vmqiVvtQ== X-Forefront-PRVS: 067270ECAF X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(39380400002)(396003)(376002)(39840400004)(346002)(189003)(199004)(48376002)(6116002)(97736004)(68736007)(478600001)(4326008)(5660300001)(1076002)(6666003)(2906002)(53936002)(16586007)(3846002)(66066001)(6916009)(316002)(15760500003)(47776003)(50466002)(54906003)(6486002)(50226002)(186003)(16526019)(476003)(81166006)(25786009)(6512007)(11346002)(446003)(105586002)(7736002)(956004)(106356001)(2616005)(6506007)(36756003)(76176011)(386003)(2351001)(305945005)(486006)(52116002)(51416003)(26005)(8676002)(81156014)(74482002)(86362001)(2361001)(8936002)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0202MB2782; H:orc.pedanet; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: axentia.se does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 23:IWzuIBQlojXzcwU34zUK8HG/5EYLsi5+WWqfSdFBqj/qAYWE9Nnq9FbSnRbYFHx+uea9JWVhvpIl5eYYDkl86cHys1i1oS9rQ7wUi+86qiFsR53hzVgaFmpca6GxUr0exqv3sg6qoU+x2GwrjOK8kZw14dDGxSWzkv0fmgxvKvOMFnN6Xz5qwQq5ON/+8QCcwwopAV2x9L6I5CCP4AchF9aYSkijVdEswmhmVZCyYV8Z21+WdZWhk8qDnS+jZFEP90+A2L9k8n23RkAHVqpgPFTp7FZNqgzePagnEYIwsJNdSfLhqWO9c7AZe1UhPkL3RjcZQ//wgluQW0AuJrXIDuEt+oX4a4ad5o4eLLJGhSPhIxJjtNOnD+qzo9TB5e1VwN3hiuvkjnDlZvOxdJ4LvZIScRKIIzkm5Iy451Hv+6K6fylF8Jjvs2swlzbYmZR3Hn+7S50O3wXX3173ZPHcQCr+OMLD+GQ2LtX2q0L5vcOQZi4tN7gxSfWzyH+vHHLzUo/pe1yCyqG1E69E+xCGmLihJu2wKFGxOkHh/3KucCcaTHRm0u2ykZ98g1Q22ae+V8BAca2plijaaU5ruNTyePg3K54aUWZpx48zEUXLAHBNGL7jWdgq8EY93/UQ32tO3fbYPB8cPY9BMNDxCpXrOYnjA0revR4GoswCJMTFNNAMPt0t+JQProxCz6pzMwZ9bFkHxTFIRtuWxth7SZEBJrI8sW0Scoe4vfnI3CA3pXqChwRM3Gz43CDHjP33xkyOJtj6963+ZFBtCBWG7iURHNpIL0QAXQDwidh1Edk894risqtkFcfbM5l9juBXCHJWs0lKS2UVS1KP2u5iK1ce2pd+lBqHH8jIj5Mo6e87qpbVX1dhsEyplLa7a8MaUkbMF8awjqLRsYk4h/EFy4A4iP2RHgvzO2FW3UP9jkRbfPaCyLhSr1AEeaE3u89xK4RCGLClXqm0ka+Qbj7Xb1+M20R//5eK7SS30fvVWCCf6f7m/7kLo8ysMbTWs14WpRP97ZAVM9yMgHArpTU4qurWDKNis+gNkbUVhNKiCdWvWjaiDGAg7/FxRtstZZYOb5mi5ahsh/LETBSRS8ISIs3nsnI6Mo0ICwaUbVzWKEaUPoOAsOFpowUE6dcuF43aLktOekwzTL7mY8IIb/PycNOijuX+DvLx/jrxUHg3qKB4asLhZnDutMmT+eFXWSwWbIcu/lVYuAzAB6n7fZXe7wT6Wo9NX27nW86t4gofmVJS5vXtGw5pbombN4dGNCIn9ztzH4lz4DxXHd3WeWPXscdV/bDkZ/DgqL9tQeyf1CKigDF5kXDVLcviMTaVeTkToUpb X-Microsoft-Antispam-Message-Info: pGvz89OftH21gTPdBD/TXWsSYWIXAPU0aBNo2ebYwhAad+GUE8eO8kzzE1YV87zR2GCJPO54AAdTMGge1fDklZwfdTh5pMBcOmf0rDiqqn6Qyo+usGaspR2ELd+4E55v0qAwIUedP5fgqAPq0xRjxEuFb+Sm2fV3vtXUdLQHISQ9m7E+whm2ePXyRfCHdauG X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 6:0WTbfsfWF+tTJrX1MPj5hCJ2+wK6NVkDucEsore/wsYQaRo2VMgoPZj3M7C5oL1DgPrvNTPcXl1bmLuyoCLS6YLb5eQuivspo6hB2hu1emLFS/3B76JcJaXjPx/yVzaGFuNHnunlp6GUzL40zsi8XSj3I/2AsHluBpT180aG4vIkQ1+Oybl8y3uPm0qNaiXbD6V9MFZD2ZygXNGLerBdLfLCqSzYvQekD9CPm1HiiiJq3vm1nMqBWZ+WL3ARtIV1v0yCtpPfKxmCLYj/UJA0L8otWWQHIK/vSpADwY536wJj5zFqTWOkmu77XFg6gTNbH43+yteqXWWYlvmcmBpljJHD0xqipocDhgHKzQ4y2bV3AASy6gufpC0s3TOmpQlW2mLRoAYhGG52iNpBJwhJG6+xDBCo4pg8ZdfVwplYf+XzuY+2zAi2gaGm59BoTh9bUNNdWnVkZWPG5RKa6Ssetw==; 5:58cMeKRY/vG0CEgT32d02o8n6peG6UpA14ZDBaPvtYw78BGkQrYPNZi6/a0IsB1x66zvO3PPMABKbshLkYfzHMrgQo5t/ieOgc8qUvE+/3t2TDPNIfIn/I6zPEsnMcuoGEl+9dHFdfkNm+DE4FjFOpzzHdoupIHsqKIqpdf3WNU=; 24:52ZH72eUOyiQynjLzClkGg11NIvQpITFH9HGpslh62uYmh2Cw9xAaW3qIR8K4Dg1Zb6Gcymx/1OWysbDEE+AhGWy9oLbawlylrhgjQwrMQA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 7:hv19IVJuWhuVMukTsAgXDsjo0HngsUtSNh4jIvGGRFNwLFG567NJcv53XLqbatDMNiHsI5DnGeDlr41P3YM6g7i3y/EYERwyDDb7dpm+fkwXn9N75rxTkHa8K+GCFKmqfjP4g0ikPtww6rPnVYEMUs6wZDI/mW5ci62r6TSnVXa1odxu99vo398pAtHvfxpbsbCC64YB3ud+aK4IX3Pjbf4KdSnBAVL7XXsH2dgmFFyzjlO688YDMjQkK6vePo7Z X-MS-Office365-Filtering-Correlation-Id: 9063856e-1394-4b28-010e-08d5b9aa92a6 X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 May 2018 14:54:19.4974 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9063856e-1394-4b28-010e-08d5b9aa92a6 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4ee68585-03e1-4785-942a-df9c1871a234 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0202MB2782 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Because it looks neater. Signed-off-by: Peter Rosin --- drivers/i2c/busses/i2c-axxia.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-axxia.c b/drivers/i2c/busses/i2c-axxia.c index 13f07482ec68..f70b097fd567 100644 --- a/drivers/i2c/busses/i2c-axxia.c +++ b/drivers/i2c/busses/i2c-axxia.c @@ -351,13 +351,15 @@ static int axxia_i2c_xfer_msg(struct axxia_i2c_dev *idev, struct i2c_msg *msg) * addr_2: addr[7:0] */ addr_1 = 0xF0 | ((msg->addr >> 7) & 0x06); + if (i2c_m_rd(msg)) + addr_1 |= 1; /* Set the R/nW bit of the address */ addr_2 = msg->addr & 0xFF; } else { /* 7-bit address * addr_1: addr[6:0] | (R/nW) * addr_2: dont care */ - addr_1 = (msg->addr << 1) & 0xFF; + addr_1 = i2c_8bit_addr_from_msg(msg); addr_2 = 0; } @@ -365,7 +367,6 @@ static int axxia_i2c_xfer_msg(struct axxia_i2c_dev *idev, struct i2c_msg *msg) /* I2C read transfer */ rx_xfer = i2c_m_recv_len(msg) ? I2C_SMBUS_BLOCK_MAX : msg->len; tx_xfer = 0; - addr_1 |= 1; /* Set the R/nW bit of the address */ } else { /* I2C write transfer */ rx_xfer = 0; From patchwork Mon May 14 14:53:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Rosin X-Patchwork-Id: 913011 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=axentia.se Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=axentia.se header.i=@axentia.se header.b="EJ+8m99f"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40l3kW0YNMz9s0q for ; Tue, 15 May 2018 00:59:15 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752230AbeENO7A (ORCPT ); Mon, 14 May 2018 10:59:00 -0400 Received: from mail-eopbgr20133.outbound.protection.outlook.com ([40.107.2.133]:30201 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752008AbeENOyZ (ORCPT ); Mon, 14 May 2018 10:54:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axentia.se; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=uoIFc0K+YghFS3IzDRuEiXbQ16J7SxFT0F2pyGDcI30=; b=EJ+8m99f+6t7ydHnHS4Py9wd0DXAZW5xGmBnlR/sy6Cr0sGe7zlJVcA6QbU1K7lWvCuOvP2I99sRCKybitQVOGmn6ZulUZDDkciZa16QFmapx/it5C/qq+iftX5ifYr7AaeKwmdliFg4Dec/nKQjwBWN5JSv1l1aIHSWsmDxQjU= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peda@axentia.se; Received: from orc.pedanet (85.226.244.23) by VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.755.16; Mon, 14 May 2018 14:54:22 +0000 From: Peter Rosin To: linux-kernel@vger.kernel.org Cc: Peter Rosin , Guenter Roeck , linux-i2c@vger.kernel.org, Wolfram Sang Subject: [PATCH 06/21] i2c: diolan: make use of i2c_8bit_addr_from_msg Date: Mon, 14 May 2018 16:53:15 +0200 Message-Id: <20180514145330.4857-7-peda@axentia.se> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180514145330.4857-1-peda@axentia.se> References: <20180514145330.4857-1-peda@axentia.se> MIME-Version: 1.0 X-Originating-IP: [85.226.244.23] X-ClientProxiedBy: HE1PR08CA0043.eurprd08.prod.outlook.com (2603:10a6:7:2a::14) To VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(7021125)(5600026)(4534165)(7022125)(4603075)(4627221)(201702281549075)(7048125)(7024125)(7027125)(7028125)(7023125)(2017052603328)(7153060)(7193020); SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 3:5+n8d/sm43ZFauauA/CBFxjg0H6F65MzvirfSX9P9/Z1f+NaZZnvHgLcXpIhjBln9TUKCXg6/CVxWqU9XG+UILZjVDqFQgqACLSWdT9NrR9pdqiT4C/JRD8/oCr/l61RkbVTa3JnF7bcf11rkX+CprMnovJZ/oPo7iwGAF2yqVelaEbXCrnBgyTWOID+h/XFXMY+IHBJor0sGPkVL8NlPc0k0UeXPp0FM4ZtwJeRTs3OS8RgleAJ8Sni7JSnN/5R; 25:rDYUUJAKtJShx5JQvBPhYB6MHNK2wqmypuyNQNcRiakoyUca9uF+/wezrY9uZxTYtPwsplAo0EZADIMGYjIKA9eTzhbhSvruNhh6vh1dXJXCt33XK4U9dPK4LLnF5YO6UfJdyWcDH+BFuGHxtJeSEIluvXgRAP2nfm2CYX2s0XwBgqHXYPCKisPxiVwlDddq0i/zrLYFppblX6ctdRx17ERvDSBtMp8qHZlE3m+3MrGK2h3+d8ErSmxdOxYeMmplmCA/AulKdk6iSmL35m4ZYfbLSLFDWZUcYzo6EsWNkjJIcQ/kbN7JDQw7SpAkBXCY/IIrRFIaPCydyIg7wayyqw==; 31:u4oO9IpVgME6d1fidm5unKDAtQz2c6733jCw0WV/mn1DhIzsfFnZjUGlQGa0fNo9q+6WG9X6HBe+tZnd/v9bqL5t5PgoxJ1loPIcDzp0K1RDUyXHP6tonBPHCOtCyEqfX4fx+y8KDRoDOqW2a+WjBAEznAjAeCnAmxcGijzbZ+kSpF1Yv6VUvlXzPkWGLjvx9bkq80z58MiigELZyHCMthhICahogqOhJeS8WdvHROA= X-MS-TrafficTypeDiagnostic: VI1PR0202MB2782: X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(3231254)(944501410)(52105095)(10201501046)(149027)(150027)(6041310)(2016111802025)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(6072148)(6043046)(201708071742011); SRVR:VI1PR0202MB2782; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 4:l08HRs+Vylpikj5+sIKpLbrtSrxedpCtPC/gYfez1QFVhvRvpjsbOt22cCysNfb+LMD2c01leqIsIF1FIw+oizpBJ4IBgXSQYo/3spUFVPxNWMuSgpb6kvPyfcvWsaIPxkkC0mCcQmNgSvj+m9vZbRfxr17Akpjftv2Dunqe1WTmNAZmUQud2XyixRO97iuSYh9Ng3LEAtyaUmhAGuMOVBHhRYxPwX0Mm/Kf2hj7VYOI6LwrNDzpRQt9X8DGhZtdi/e+hxA5nz3199cO8aE3HQ== X-Forefront-PRVS: 067270ECAF X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(39380400002)(396003)(376002)(39840400004)(346002)(189003)(199004)(48376002)(6116002)(97736004)(68736007)(478600001)(4326008)(5660300001)(1076002)(6666003)(2906002)(53936002)(16586007)(3846002)(66066001)(6916009)(316002)(15760500003)(47776003)(50466002)(54906003)(6486002)(50226002)(186003)(16526019)(476003)(81166006)(25786009)(6512007)(11346002)(446003)(105586002)(7736002)(956004)(106356001)(2616005)(6506007)(36756003)(76176011)(386003)(2351001)(305945005)(486006)(52116002)(51416003)(26005)(8676002)(81156014)(74482002)(86362001)(2361001)(8936002)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0202MB2782; H:orc.pedanet; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: axentia.se does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 23:bn8EEsyyxQ0cAHqypFpGfWC1p68qvqPECVg3LP3ajTWBo1GTLlN1sMUGon30uiAHtFeP6VxMPILakZlK+EAY4Lfx6yjrN95boXbFsn+wHOXycxb9JEHS5N3/NSfNbfRapMlp4poTedPrgss7lYL1f3CHQPxXDs7QTfoQA+w/zzrPa00eTkVonLuhvOtKRO8+gq0OpMvM116cPf0MwvjKgKz5TUKUiHVTkHMTSERXmHQ+v7Qy5MmHgnrxtUR+FFGP0PA51gk2lUuO6rNv7NOJLkFP+3yJXSmsf2q8lDK86+PifEPvi/Sy42kogUkQw3qe0JZJUstfGl120+oxggDnDCFNyGDC65thp237wCyOf4fqk6AXLvXvsD0HXVFARp/br3f5O+cwv4IcwhqxPBJqUCCGSgnoLHBlXDQ8B3ZR4zUe4YqdPI/x1vvtseznc7Bm34Y1MaVtS2kGHCCAXXEqxg794Smg30YeY5gigyYd4Uk+GFYzomqjb+Oh1XVek+mOcfKtWImKoJoq2EXhiRXndgq7ReGfdyxglX32Mq/+pg5eQn65L1MmLEs54l1UbwbwNxmAQkS/oA4bt3K+GY8gfHHQqc/2r6BLRk5uocZlIcwSQY7vY7OojKiUr7MDqDnCyQTujmD9drNm1Sq2cXGN6fWVyHl8lNRtZeQueX+HrPlTYo1f8/vmS5qg0gF/ihhgw2gVsM4PoOy59pBRGlk5KvYmaE96FU2fnmmTDmvpt5t03iMx2PW6sQyedi0SR8IxcepHWSdrtp67iIlQGeVJkQ2iu559djPG1Y6dKuip7l6A4N4XhvXPShbmuOiaYab6NtcM2OFANh6jbrQSxiG+Z9FsuC4Ef32LjkNnYh6Rs0ja4MHj0W3hgR12cDmgp871l9gsjLtsu2eMaV75psQikT1rku9C7nzoqmPuFybFMYrApPv7E4NKsk0PM8nJ4iWpQJF25nOEh4pqHaHN34Z1niDu9nIeCom0eU5zezojsXTrBdThGoZQnGXQ1mr3otCA8xXw9TxRGFpnbhnWCVw0jB/ufffK+uqInvqu+gYjUdOxjJaBuEPOybcCYNOHBjza5EogEu074LKowpQBtq0gSaiK07GXBfWW2ZGEiQPF1rmBHF+Ncl6GO4W4c6fv1c9GfJkLxAhGnLXZVt5Ec64YXL6YTGiAOZLgYHmDe4ZCpx/zwomv323g4PfglJrK8ndMOz48Aa3abtI8NCJGckF3TjxT0wmuSROz4F1sR4FAjglcZ9or9/q2D2wpBoBZ9OMBQRF17H8JmJ4/HgYb8vgm+6p32cuTvlcbF8JDI955QZQl+4ZNm9AdCTkQokK1MGJD X-Microsoft-Antispam-Message-Info: 1z5+6OKgcXHnWlOjZtVR4pxptVUkZmH4UZKZ/7IPwQ8jfdNsdUF6Mt86O+PK53XgerwOmy/Aonak3hiqk9F07LeAF7OUEN5Udi+XQZRAGVcUZCW5cAEjy4xGwEHW9UkB7d39iuofzGxDLYODvL5YMj0LPLzZN7MybEpH9X84WvxzS+zO3IWD0Y7Qu5A1r1PT X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 6:5cPZ0Ky5DDiYWDulDs606CdW+WMgJa39H+ihh29AAz+ppnoFHGdJZi+obChqLlLJXrpTcFaH4IymO4Q0lYSuU8stDQ4hOuiFYfC8GnwmonvmpZry7PW6GQpJS/h0h5Q3ErtNE4jngLyX9R2xk3S1tS7G8UUjlvbUFTKl9uL9hMNH8A1KlrkSGJ2th+dPOIM2RFSWY0k5t24HHQ4e0WPdfBHUtj3tq3R+bK0LTCc2bbfcbw023OId3oK+k0rgZYB+u3Tq1BDBCcufcv85bx+uMVpnJ+O8Smf4QHl6AeUi32cHhmGkHyouFW340vTknGUpHJrkn6Rt9+o2Vkshburbp4YiAY7FD/LzlMb1h4Ta63qxmBm7QIqb8DQQg1buH0hdIUB+CxIE0rQMrpzHSijjqCRnkmtMq8AgpbeHHw+UVLBsE2YB1DgBddzxJ94iw0CIDuuYwF/sWSvjDG3LUEAv0A==; 5:5OITH705nPdSvcdsaTiHQ7IXN8h/a2NnOQlnBbg/KQ+JmhTZgfVh39sKSRLjz18omqqH7JbMery+EevU9cXqMIraClrPZ+c4Vy8u8tWPPWcrmO6E7eFHppoG0d5DfI2qKvnMIt/vhWZW2HxgyWKg4XNhgfL8JC29ROejArkbybQ=; 24:6rAqTTxExJTh4GLmwTgVyx4zJ/dgXncTK1DoO0xYX0qZdJG7lkYPsF5YyC72Kk1+pl5nFrPhPYWkqGpsyFu8ma4/simWQqsthObRIvDrZ0Y= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 7:Qv5O8G4DbHR2lGpH2NfoS2rf2XhOCTJaGcU0kZlHVpz2LQ+P0vSk0kZzxXYxDhenNObJq4BIsQ8q6UbH8idrPd8aIBdPqQqk04SXXXrGV+GlSqPUEKHGWbg7DVY/fDf7Zy5bWlnNI99LPj5r0GWlmD75ZM2Jc1ZuBKB1FJ70DpmGlOXGTIegxUsSdaZEeSKxE8nvsTtkhwoChzIL2zFMrR27LIUHJpl6f2lfI68ezwq+sqq6olXP0r4YqkYUxf3J X-MS-Office365-Filtering-Correlation-Id: 14ab58d2-6677-46eb-d97b-08d5b9aa9463 X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 May 2018 14:54:22.3256 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 14ab58d2-6677-46eb-d97b-08d5b9aa9463 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4ee68585-03e1-4785-942a-df9c1871a234 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0202MB2782 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Because it looks neater and allows factoring out some code that is now common between if and else. Signed-off-by: Peter Rosin Reviewed-by: Guenter Roeck --- drivers/i2c/busses/i2c-diolan-u2c.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/i2c/busses/i2c-diolan-u2c.c b/drivers/i2c/busses/i2c-diolan-u2c.c index f718ee4e3332..3f28317cde39 100644 --- a/drivers/i2c/busses/i2c-diolan-u2c.c +++ b/drivers/i2c/busses/i2c-diolan-u2c.c @@ -360,11 +360,11 @@ static int diolan_usb_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, if (ret < 0) goto abort; } + ret = diolan_i2c_put_byte_ack(dev, + i2c_8bit_addr_from_msg(pmsg)); + if (ret < 0) + goto abort; if (pmsg->flags & I2C_M_RD) { - ret = - diolan_i2c_put_byte_ack(dev, (pmsg->addr << 1) | 1); - if (ret < 0) - goto abort; for (j = 0; j < pmsg->len; j++) { u8 byte; bool ack = j < pmsg->len - 1; @@ -393,9 +393,6 @@ static int diolan_usb_xfer(struct i2c_adapter *adapter, struct i2c_msg *msgs, pmsg->buf[j] = byte; } } else { - ret = diolan_i2c_put_byte_ack(dev, pmsg->addr << 1); - if (ret < 0) - goto abort; for (j = 0; j < pmsg->len; j++) { ret = diolan_i2c_put_byte_ack(dev, pmsg->buf[j]); From patchwork Mon May 14 14:53:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Rosin X-Patchwork-Id: 913007 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=axentia.se Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=axentia.se header.i=@axentia.se header.b="uHn0LB5R"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40l3jS1mxDz9s0q for ; Tue, 15 May 2018 00:58:20 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754011AbeENOyb (ORCPT ); Mon, 14 May 2018 10:54:31 -0400 Received: from mail-eopbgr20133.outbound.protection.outlook.com ([40.107.2.133]:45712 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754001AbeENOy1 (ORCPT ); Mon, 14 May 2018 10:54:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axentia.se; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=0vmbbgCdp6wwXq+acbrc6IQ4HS0dNKVUn7WP4Qo4J0c=; b=uHn0LB5RvWj34n/MXS57dN+wZpnv20QUES5i9oUXGFns05lQByrZwwTE/RuQyX1rK4V1KlYFdt4mOgC04cOXp7bzr3s//4PvMvJb6hekxXXg/n8evFzVAgZAOz88WvP35a2XOXViRUQP+zlMZdxzjr7uz9YkYS2XKAAB0ZxXOyI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peda@axentia.se; Received: from orc.pedanet (85.226.244.23) by VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.755.16; Mon, 14 May 2018 14:54:25 +0000 From: Peter Rosin To: linux-kernel@vger.kernel.org Cc: Peter Rosin , =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= , Pengutronix Kernel Team , linux-i2c@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Wolfram Sang Subject: [PATCH 07/21] i2c: efm32: make use of i2c_8bit_addr_from_msg Date: Mon, 14 May 2018 16:53:16 +0200 Message-Id: <20180514145330.4857-8-peda@axentia.se> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180514145330.4857-1-peda@axentia.se> References: <20180514145330.4857-1-peda@axentia.se> MIME-Version: 1.0 X-Originating-IP: [85.226.244.23] X-ClientProxiedBy: HE1PR08CA0043.eurprd08.prod.outlook.com (2603:10a6:7:2a::14) To VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(7021125)(5600026)(4534165)(7022125)(4603075)(4627221)(201702281549075)(7048125)(7024125)(7027125)(7028125)(7023125)(2017052603328)(7153060)(7193020); SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 3:qw9zN3uG/6lOvtIEKT1aXWmKoyAiNQXRI59fHNK6mJmPuGjyO2MBJRVzLHK1BXeJS0D+dj1TnEs9hlsNNn99WcA1lRsolAzPyp2XWPoNP6ZBaS03RzvdWo9c+LDhSnBNIlqxNLDPOyp7bOpqQjoWKPbRBDTchltAn6eyztvtdSBZOy6qh+/Ok11qryNN3MenpaS7/8v0sDSl9LZ+Bp61c/Bh+mjud8suelFzET9Fr33AriOzbwdgXtFMJzRN/WGN; 25:gcf9sL8uj2UqpBrbkO0eMJVkTarhm1UAptDDeCtA0HJMu7u20MyD0ZJmw9i0Y6ZZDVo3ugQm7YvVrXVTThR+cgg64uNkPGw0nr/EeTf6XRwJvcVo1sfb6qcvck1/8oTyRgKHEayh0R2PVthS6mnOdCAZvEbRUfu8UJO130VfguDN+Mqv5nbudgMduDN5tXiaFzGCT3dEknxTHtu9v7bryPPTxXnqv1fFea9gkMpkasiWkWmtQXmEkve6D3Azs47yLdeuNaiNeMuNEbukqSWd39NGdoaNgnX44LkEgIFJQ0zvo3ylw9NJrlRpkGt2XhCRSCsCN5OzAIpjWidRe5zsew==; 31:OHoLPv7IcZCPs4v+k52BYutYYa/RUSkj6IaQfVEHe7+y9fZpp8vne61NO/wyzrmaKqYJxn00KdweGywDa+1SHEvVDOCqRX2mq6HpvFPlRqAcqk5RsJwNkuY/h/ZxDuUkvMbCXQVLHYBiWvKO00kuPPwaSdjg9Fk4YcPibaZHC1zGnavDybmsgTb8dXDth+LoQqo4JQE2mQwiiRc2sjkG3dwuuad75d/GKWRBM4GjR7c= X-MS-TrafficTypeDiagnostic: VI1PR0202MB2782: X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(3231254)(944501410)(52105095)(10201501046)(149027)(150027)(6041310)(2016111802025)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(6072148)(6043046)(201708071742011); SRVR:VI1PR0202MB2782; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 4:Zs0IgjazGSgAnw1QfQBJNspLgO6HKTQsO22M/JUTOivh3wXpbbIHT1KMrWIp/oOTD/0NmArws2DDy0573xh7aEkTyka3UwNl/Dob8td8hjePczlIV471N+IJvdwlYhU2KqWuuWY1lDg/TxFGpyoWK483ZhHuOcXWHOPSgJN7d8wJYCOU4b62RiW9+rchSr04dvc1XGMnYaH/v0TbEwr9Cgisp/eZ2LxVgYEYdpAHCEPlegi6lyimXp1NzTiKUrRgpkuk2B8heJDdwzXSE5lxJQ== X-Forefront-PRVS: 067270ECAF X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(39380400002)(396003)(376002)(39840400004)(346002)(189003)(199004)(48376002)(6116002)(97736004)(68736007)(478600001)(4326008)(5660300001)(1076002)(6666003)(2906002)(53936002)(16586007)(3846002)(66066001)(6916009)(316002)(15760500003)(47776003)(50466002)(54906003)(6486002)(50226002)(186003)(16526019)(476003)(81166006)(25786009)(6512007)(11346002)(446003)(105586002)(7736002)(956004)(106356001)(2616005)(6506007)(36756003)(76176011)(386003)(2351001)(305945005)(486006)(52116002)(51416003)(26005)(8676002)(81156014)(74482002)(86362001)(2361001)(8936002)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0202MB2782; H:orc.pedanet; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: axentia.se does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 23:yTilnvqr68a3w7ayI6091srFI7Q7tJ/ZbFAa/aKVFs9bEBmVD/2yPuRuEA8Ha/1gWwoMeDixZDXOBC9Sm0nnL8Attix49NmtHYGby32+zVM4wTidf9Of4hBM5WB80SdxSmBvLNYrlp42+QJSweM6opooD2aj5EJhf9BNNMmuYpWW/yjODpdH3hdUnigx9rvfY7su2LBIz5yXGACsXA3uCY+wtlDSza9CnJjKIhWGDjM+v/NqigZZoryIwbdZe03kbk5g0BzOEysE/Wo/ZkFKN/UmCczh2pG1BpWnqYyFE/Y2PKINbhBUHbCbvOjNbND+o3waoDcvheptKNi7GhFK9YWsyeKuOkr4Vr6PXr1nCML5dW7D30/spXjaiffq2t+mYoWEe9wl7cuCIg7ctzVdMtJ1nBdxvD7PeTzTtkkLJxZyrYI/D/96D2jqUB7jkBPkKBPFDIFqRevpjQbPRWL1w+ZGaS/Odz0uZXAM237/twHHHhfxwtC2ncNlW5kNQfjMBLdhGWJhLLE+SxCoTDrxQ5YZ4aO3m/FpfaHH86uWdI13HqviAC7ZeKMBFUJ+cf5Jb5KdRNLD9cnxrEKn1cz/OgmdUVRTpqtvuw21oydWfQLw+41Ug0AIlwBSHMl12ecOjTFwF/m9/26rYUBeJRiVhbx7qyr9bPhvuBWQvNq0Yl03KmEeoWaOB1lPpzwFMP0qWRspcPKQTHvAlu44LlbLwkdkCA4q6cDARWslV96PDEzx4JuTZou46NjnCg2uu4IuJU/fYvlFz9y9CjB/YZMnbsDRRcc6XeTPqatz5BZ7RUE1wOKp6Wq+ay+7npg71N+DsUYYbw3KHTMQCPQiSvvGrRqa23UtNWWoahQ2LP7QfzI6fRDliuuUY+nQ9LWc1+WsH7RWRG9HNyna5hE4tR29UNTVAJ7dGY+PcyTuY5+1MHgi5EM2et82Y0zaDvz/L9KovOz06bA3yC+8f2ZSxb4UyUtGBQU39ekX7uRgr634OFbLRKFLNWo/j0XGYn+kSodMy8BQJZmMczJQYzPx36Uhql/pNUgfFhGm1J3rIBWg/muPFW6m9ou28wQnWrYDbTOTtozP4rDoKpYGp0GIJbmB8wYrsdjk6LKd4YXB33ggSTqjB4mkeg+rp8zWIUQOwzRdCgplIFbeePPECXJR5HP/8GCsEJI9Ow6DOYqfgCtCyAKavoyjtAJOeiHAiMv3JlIqwNu0jj/D/CVcOPhqu1kiV8nw+E1P4flvM1tMAqy0+9PR+7F3nQeFwZ+J8khq5VXLKHH9nrIPJvR7JYYCkXOLRvI4JoFvlwtZQKX3dV/P24z76vDKF0aFt2mk9vKm93uI X-Microsoft-Antispam-Message-Info: rgB4rWaLqo16+Yl5LtiR2Qf+IKMQnSQDhgqWQse3heDYd7rppj6pW0pt2zQmv8kjROBeFiDeImiBa2kSI/8HgRniCZW4SIigdBb8VulPpKJIH1lHVyEtm7Et7DENzCwqxeGBOve5FBu/suoqkwifkRa9rhl+6i0NTRRlk+PeZ+R0dgFCit0D4b4F6XizFGiT X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 6:ys0IApEbhwoZr2FtCmbJTJYbfG0isEE/CiAAdAZ9V7/+eqHC6xVl2XqAxiQVPy0hUuaQlO8rmrLZT5x0iW0jcsqlmUGqPbBQsfy1k6ZWt3pT5TgwGitPhhV6sxZJn7RcHPvQDCYCjhfys2BwSZQQAC4SuBtOp9uQT/BvEH7oOmIdLsRq/szdB8iHj8vV8KHGjrGr2BixpQNOPYvE4zC68w3LhkqIsI4fmsO3mOUXEaI7HquOsYbq8MXWBpvSKZ8p+r3cWRDeMPWdoDNGBxTukZEtGR8GWbw4Imefb2ua8ysDcwyzVxnkKNqR3JXnxwXQT059T+F4yOqpSeOm0evZNxgsWFTNGZ5PqJX7OvXDrsvKvRpxQ8ekUV3+62soxeXKEtz6VLTd4IZ3sryazj6h7AJEyknIeZTavvL/XZiEG2JlTyP5UeXnZLbI1JUjKCporg7mkywg7VbsnJzlWTmNsQ==; 5:l8eswdc0LrRfdcDaXYboCpXvNoKMhfac+65ELGeTj6I8nit5CDaHvn6z9SLqbAavlntHb2anRdPR+LtNdKnFhQP0xXPEclKJuLO9l/QMap/sEj+VdcmXwhJd19t5I8Q8CaMwaBcnK66lrtQHJXpS9YXHL7JAvMGslsU008FMHS8=; 24:AdnI6tPxyHFk66ADEi8Pl3nJyVfaTRetFPIzrVudF4d+x0zb4stxSoDfaKiVOxwV8L7CPOzg2c9EmCDtwLv4WiXDB35bWbj2I809LUtHi5g= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 7:yluhiEPZJwK/Iv2zGGgInoX6/zxaXmFslf780wwU3S+5a0ewSE8LrEeeGUm8aPPyZTLszP8YJgGTKBGtgGd7RxwusWH0/JHBreP4D4dSlCkMFRBd5+eWZzc0rWV8+fwLdgJ9BK+kQfX31jBECZ9H18jvsCxFYfhDDQ1l+3MiLA6ARnptEE7pzuL9vacqgDY+rZ3kTgTTrgfdHTkL5gr4MV5GV9mkHD+vFpINThi0pl6Omt729nFWovCJBAeeLLDr X-MS-Office365-Filtering-Correlation-Id: e189116c-8f41-49d8-6260-08d5b9aa9632 X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 May 2018 14:54:25.2787 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e189116c-8f41-49d8-6260-08d5b9aa9632 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4ee68585-03e1-4785-942a-df9c1871a234 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0202MB2782 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Because it looks neater. Signed-off-by: Peter Rosin Acked-by: Uwe Kleine-König --- drivers/i2c/busses/i2c-efm32.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-efm32.c b/drivers/i2c/busses/i2c-efm32.c index aa336ba89aa3..5f2bab878b2c 100644 --- a/drivers/i2c/busses/i2c-efm32.c +++ b/drivers/i2c/busses/i2c-efm32.c @@ -144,8 +144,7 @@ static void efm32_i2c_send_next_msg(struct efm32_i2c_ddata *ddata) struct i2c_msg *cur_msg = &ddata->msgs[ddata->current_msg]; efm32_i2c_write32(ddata, REG_CMD, REG_CMD_START); - efm32_i2c_write32(ddata, REG_TXDATA, cur_msg->addr << 1 | - (cur_msg->flags & I2C_M_RD ? 1 : 0)); + efm32_i2c_write32(ddata, REG_TXDATA, i2c_8bit_addr_from_msg(cur_msg)); } static void efm32_i2c_send_next_byte(struct efm32_i2c_ddata *ddata) From patchwork Mon May 14 14:53:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Rosin X-Patchwork-Id: 913008 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=axentia.se Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=axentia.se header.i=@axentia.se header.b="Iq2ASSbN"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40l3jT16V6z9s0y for ; Tue, 15 May 2018 00:58:21 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754151AbeENO6U (ORCPT ); Mon, 14 May 2018 10:58:20 -0400 Received: from mail-eopbgr20104.outbound.protection.outlook.com ([40.107.2.104]:52928 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754009AbeENOyb (ORCPT ); Mon, 14 May 2018 10:54:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axentia.se; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=TXmaTZnOFU6oFz3EQPwRcM2H1MGtegKRvdjo9mCa85E=; b=Iq2ASSbNAleQmt8zObOiZNDqrCuWZ93CpIv1Z74X9UROZSW4NS23o9BqqzORVXgGnyq8DTg+tvBIvOZfIJuyWlAe2TBZx0atWEe7VH+ZM7LwfJB6qAxbNwL31Z08n8aFPe0wj8j8QaW4M2a0zXQoOiWytIiDjmFI9ScLy00sO4M= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peda@axentia.se; Received: from orc.pedanet (85.226.244.23) by VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.755.16; Mon, 14 May 2018 14:54:28 +0000 From: Peter Rosin To: linux-kernel@vger.kernel.org Cc: Peter Rosin , linux-i2c@vger.kernel.org, Wolfram Sang Subject: [PATCH 08/21] i2c: eg20t: make use of i2c_8bit_addr_from_msg Date: Mon, 14 May 2018 16:53:17 +0200 Message-Id: <20180514145330.4857-9-peda@axentia.se> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180514145330.4857-1-peda@axentia.se> References: <20180514145330.4857-1-peda@axentia.se> MIME-Version: 1.0 X-Originating-IP: [85.226.244.23] X-ClientProxiedBy: HE1PR08CA0043.eurprd08.prod.outlook.com (2603:10a6:7:2a::14) To VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(7021125)(5600026)(4534165)(7022125)(4603075)(4627221)(201702281549075)(7048125)(7024125)(7027125)(7028125)(7023125)(2017052603328)(7153060)(7193020); SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 3:UFvG+TMcCie1XCvv6XtLtb3y/rc/2v5Bfnaqv1adKnCcLidRBccQC9baSekbcrHKn8xP818vjO15HSn3ZgwPFwMod0hXTBBuMRm01dSkrK8kUcEj8oRbv+wqhokMi6TsKpGm+6HaUh91QQYwnLJ0FFb2KwXFkBVre+wU43nsy/ZrV1mi3aqi91X9FPci1E0eri94kQZ4VWsjEpq5TeqoPkHCEsdQdEum5vmkwRQ2r+QMoCGVtl2SBhVa1mvuQQQc; 25:mx7C0iK0rnk7aELUhoOxuilQCXYNg5Vmrc3r2CgBM9IK+VpoQKdZIz2D2SJYAA9WWNihLh89X5HVa5n3U71O3CKdZEGArQKL/VS3nel4DoTPcK5N8Luud/O1Rnv557PG5eMwodOomTEAHq2QfBncs/IIWZnXiN2n0dYOB5Dr/pcu+BnBNkxfQy5S7kVxVeqaDWe+ybogTMZsg1x/KhaGtQLYmRSOdwOfsd3qHSPBEtlzMWC5HPZ0uIOonPtoImGDgH95d+JZTKEUdeWvUQllXYBjHUe7BE9ClvfLzECM28448S1fMLocmZxhj3XGX5n4Xp8PCzezkkuqznxbz3KHkQ==; 31:9P2k0bAdxjogqNnA1B6T29yxB7UPutZF7QanyvM5yRAG33eY73WLMzS2+hVd7ERXTKPvOEH8YxxnqdJ/3apQAZn4uubo96UoYlBq9n5ktsUpAeG/88TltXPaC8AY41+a7eLUJ+7rkB9wp7z1ZmrOxIEKFlrsbgB0Dgt0n32Km5BrSHYv6dEdocgX6b45N20wwefPYeN08U0idZJxwPpjBwgO0uUzhbd3IIAV982tIQY= X-MS-TrafficTypeDiagnostic: VI1PR0202MB2782: X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(3231254)(944501410)(52105095)(10201501046)(149027)(150027)(6041310)(2016111802025)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(6072148)(6043046)(201708071742011); SRVR:VI1PR0202MB2782; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 4:N1fQjpLXu/jWxWNmvGKe3DeR1MxSntpLf/bNEOQwDwr67ONqryiIUEeXlB6aDgh5o9hzKujoDOXoM/vc7gJUItxEPcZi1x0KmdSWBoBcIW2zkvuelLwArbHTyS/rGNyk3QNwnR4JYh0dcs3D548c1sk9W76JGpX8WOEpseg36cgkZ84n2V2vCL6akMQByH94HBHGALbNJ1s90mQrkT26Kh1aHh9YNMkGrxbSzMeCmQ5wid23uewfSbaIVACUxyUJkkApqNRDM/5GFV6gfq5xBw== X-Forefront-PRVS: 067270ECAF X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(39380400002)(396003)(376002)(39840400004)(346002)(189003)(199004)(48376002)(6116002)(97736004)(68736007)(478600001)(4326008)(5660300001)(1076002)(6666003)(2906002)(53936002)(16586007)(3846002)(66066001)(6916009)(316002)(15760500003)(47776003)(50466002)(54906003)(6486002)(50226002)(186003)(16526019)(476003)(81166006)(25786009)(6512007)(11346002)(446003)(105586002)(7736002)(956004)(106356001)(2616005)(6506007)(36756003)(76176011)(386003)(2351001)(305945005)(486006)(52116002)(51416003)(26005)(8676002)(81156014)(74482002)(86362001)(2361001)(8936002)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0202MB2782; H:orc.pedanet; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: axentia.se does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 23:3QuW6bjonsuwQMx2zAZ7wU8ZyKgu7FJzxD3lsj2w3ff2DkgcdxOBn9IVveU/2Cg/ZmsXxt9kifBp4v23XIcIBNSbEe/IxLJkdmZz/AI40pL9vA0UYofx14gFD4nCrMqVRry32EAdTF0b75UH+UThN+vnN722ecdsErq+kepmmGNKKgK1JEu0uLEgVCP0UyhaNSHCt57u8Suxt473DQ2EbHsMC5YVu+tokh+d1rOBvI4UkCyGhH+E1Xa0Ykcl7362soZo3gJzzGHrRFeDNHr9jyMwekoRcTNp7D7Y1Zm21bILIlWTGH4rru5m7+sa/L+3fvnFdZzyMKs5pYlTZJMAwiu94UXbYTngG/uRYVEyodA9+RBAmCMZnrddQ+KNxERTC+yIbcma31JD7wuqVoQbZKQRRpIJFruFeJCYoLhsHQbeVWw6Dguli6BScCC1FeMZ1xTYTMVoMcYb/7pveBCUPrftTPOrUM5gAmg1l6jWxzBtgNSgC5l4usZkdbl0H3B3VrcWAuFT7Sbp8ks0mex1n3l8BBGv9p3LuT7fmPOctuDKLLnOHKSw8cTgLnEcYsrGti3zwJsrcpZNlxix3UEU1CnwDJGg7AR6oMxkUXQuXlGgxSBLot8buKEtG9U684YrJQzXWcc6y2D7Tjpl1IYOtbmjzZjusrZqi0BFwDoEoBxfGATfNdU8n9ciEVD4aN6Zd/senKfmpX6EfDt5haDCH4py60U179Zd8MrBoeYHMNjd+s6RJRVSA+0Kf2NNJhRm+oBiNclCLD4YgaJhJfdHGdyMoH1p+LIL0oC/s2Z+eV5N8P78/OFTFTN6Ou+AUjG/aD9mhpm287FczkJTr78CZUHmjm7f4C3n7fDSXz1+tq0SpI80mJ9xi4ASOQUMsoy4Cb9AWO5wujnMkVRprtUlj9ub3lxpw3dp7CPRSiwb21bwU8reLavsuDuMZwpW9ntvoCtc3TxP9eMauQBsHaqnNmAL2tMTOHcm2itOM3VJcBEkVHCJKqXZWVwd0ntEiPZHgP0SbaOZQYwAV1fQ5BzVGSD3efJDP4ObGGsjfl4vlNeiS8OTn7h7f4s2gA4pWfS6W3MdVCMM25q4kX78AmYshIQPvhxFSeu2BS3ajZ0bFWYPUEVt+3LUI9hywqyQMkoNXjIPEJk1DQxcri4F8BXW9A77eMYYXvos641xxCxwhadI3sIHban5Z+xpDnHXe+uEa2r8sITaPV4SKpiIWDnqw+ACWa0IRlnDAxMZXUjZx41HgInLZ67QpdyhmJgAVGmdWTXXobkS2uKXBTgnJJCjF8EJmn+FBu0efYPjSgNeekaQ/7YTIwBIVwYioti/LyUF X-Microsoft-Antispam-Message-Info: weae/1Li7zmjHz1s1GAKJ2gTa/QgwAkakWmh81jF9BzfCQwV0lvrK++ob/T+5Iu6nK7t7zkHObTnBCTwSY+YEPGHw7jtzSX3akPa85gLdzQXOEczIgHJ6n4x3berdjEANJHFIzQc/V56AbS7tN5SQ+hAx3S2vQVcnz/1wy3mJutij4q2ymtBiwDKkg1KW9nH X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 6:H5bzYPEDv5UBnsuweouUnpGrqh8u+eQTiGCF/nWsB0VSJtECw314da9SMPhn9GE5TEiTblZ5miMSeBTIgTamVkhVc8f+gO0YpuMOQKGNGLTGIiZe00mQpQ4I4Xx5kBNcWv39rW+7sNI5/rHRS2KP14w1mOLbIcnTUPea2ftrAuLye9VFUmnVljWrrIKyyn2uQlzZytSr7eyhEG3riS3FmtyLtrb9xUx5GD6MuyDF8CXHEVN+aGK+guMEdFR95IcED8mDTZG2/MizEPmWJAIxkKzIrPlfFWFTcC9KBVFbw+o98fdYC+z/GwSed37ZiAHez1SiDF+watWPlVDZpXdmcwiFft7nVYHdX/N8tZXQMw/b1UVHhqGaq2i2jQ8k8zAtHRt1Lo8WoYyQw+XO334NRpLKWkEZY+Z/Uu4hhoU08mQVYigeVWS69VRs/wf+R8GI01ftSDL3xgOYxfUB2w3Dvg==; 5:jePu8VrfDlUjVr7OGbRLhSmnr8NoJttiQnUigmYFeEubxi3eWmLbkX4aC0vb6+xKcJUdLSqoVtdiTl4W0iV3buFFDZRbSxVnYIdEZtOfdGpXaXEub2YwLC2odU+Kr2N5iiNTGiRnx/gADonycLYmflHtIQ1n3oPyjeOELEtzajI=; 24:lTij5K29E161ek4+9kEiIq3OQZWRYczblHqOgdwq+4gRWOD+t+trdt746GE7wjVHZkrErkCQHrFLVP92LqpS0vjNM8gq6M+jozfZIk3PuUE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 7:c+UFbbCthSnhvqSLhja+qGsH2nijupBuimIU1tJBNCGhTTycQeG082Ky98Omw8w/0YYk/VprvX3S2r/q2RLVXOgP/4DTABXAoLfDcVAOCs5T9wHh48m5j5mQ7qwNo/maM9ofuqoOEEoSsqlJFlFa6I3kAmsUrNJ1d9MC/yjNfmcOsTvCsTOTsHfkyqEr+lZfUnuQ2HezlqwEOyKXZwj10QzUxys7xiDjvsK92zRnzJQQt2yxMYNlR0rQ4d72D5DI X-MS-Office365-Filtering-Correlation-Id: fd57419c-1260-4396-633f-08d5b9aa97d8 X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 May 2018 14:54:28.2162 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fd57419c-1260-4396-633f-08d5b9aa97d8 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4ee68585-03e1-4785-942a-df9c1871a234 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0202MB2782 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Because it looks neater. pch_i2c_writebytes is always called with a write in msgs->flags, and pch_i2c_readbytes with a read. Signed-off-by: Peter Rosin --- drivers/i2c/busses/i2c-eg20t.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/i2c/busses/i2c-eg20t.c b/drivers/i2c/busses/i2c-eg20t.c index bdeab0174fec..835d54ac2971 100644 --- a/drivers/i2c/busses/i2c-eg20t.c +++ b/drivers/i2c/busses/i2c-eg20t.c @@ -414,7 +414,7 @@ static s32 pch_i2c_writebytes(struct i2c_adapter *i2c_adap, iowrite32(addr_8_lsb, p + PCH_I2CDR); } else { /* set 7 bit slave address and R/W bit as 0 */ - iowrite32(addr << 1, p + PCH_I2CDR); + iowrite32(i2c_8bit_addr_from_msg(msgs), p + PCH_I2CDR); if (first) pch_i2c_start(adap); } @@ -538,8 +538,7 @@ static s32 pch_i2c_readbytes(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, iowrite32(addr_2_msb | TEN_BIT_ADDR_MASK, p + PCH_I2CDR); } else { /* 7 address bits + R/W bit */ - addr = (((addr) << 1) | (I2C_RD)); - iowrite32(addr, p + PCH_I2CDR); + iowrite32(i2c_8bit_addr_from_msg(msgs), p + PCH_I2CDR); } /* check if it is the first message */ From patchwork Mon May 14 14:53:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Rosin X-Patchwork-Id: 913006 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=axentia.se Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=axentia.se header.i=@axentia.se header.b="en8PHaYM"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40l3jM2n98z9s0q for ; Tue, 15 May 2018 00:58:15 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752122AbeENO56 (ORCPT ); Mon, 14 May 2018 10:57:58 -0400 Received: from mail-eopbgr20104.outbound.protection.outlook.com ([40.107.2.104]:52928 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754014AbeENOyc (ORCPT ); Mon, 14 May 2018 10:54:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axentia.se; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=OBkF3vrNV0fNyeHlh4f8k7qH4O24beSboKdGV/md+gU=; b=en8PHaYMTzrRqzmU3GIWCPU0ndIN6bB7pKn53BoNIGz4iYGB0OXASplWi5wWDVXJK4zrWgFuiz6ivswNtdMsf1yZSoaMA56pw/elzRSVljmxmwy++yYOgf7WCXaWKagMgTUcA6wTV8kpRQIofERmdybcOwYlz+LJMEjeuLfC+pE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peda@axentia.se; Received: from orc.pedanet (85.226.244.23) by VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.755.16; Mon, 14 May 2018 14:54:30 +0000 From: Peter Rosin To: linux-kernel@vger.kernel.org Cc: Peter Rosin , Wolfram Sang , linux-i2c@vger.kernel.org Subject: [PATCH 09/21] i2c: emev2: make use of i2c_8bit_addr_from_msg Date: Mon, 14 May 2018 16:53:18 +0200 Message-Id: <20180514145330.4857-10-peda@axentia.se> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180514145330.4857-1-peda@axentia.se> References: <20180514145330.4857-1-peda@axentia.se> MIME-Version: 1.0 X-Originating-IP: [85.226.244.23] X-ClientProxiedBy: HE1PR08CA0043.eurprd08.prod.outlook.com (2603:10a6:7:2a::14) To VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(7021125)(5600026)(4534165)(7022125)(4603075)(4627221)(201702281549075)(7048125)(7024125)(7027125)(7028125)(7023125)(2017052603328)(7153060)(7193020); SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 3:mNbldT4ZaXPY2CaDpNTro1lYUqu2a9mhQmsepUXvsnLnWvJiwY08WuUX8kXeubexLuoPLP/9rVOo0Jjoe0mTrx/bjFzXqZBpqC+Fl0R/B8wUcw1ck2PT+LDr7zWL+63t2Fg3prskw3vXM0a3pDLAtBbPp3gM3Riv15wMPx5R9wkzOkHglp5uGbF10jz6ffepgTr5B7zJ0EvtliAMGt4nyf+a0Ei5dK2d2ARyO5R4zhRKKlZXyInSqq+qo24DnSsq; 25:YsKbfT6m6TLCZcOUyBKEb160imqXWcLukqggz15PMan1ED1Pwc0xHYGVV3E+vi3ZjkL5OJbBzGs4Siova1s5RxjdzBdq4/yUGffNSegfwGhyqLvleSYfwOKmsSqU/zNmNwongbNsT1tvHF+Nx0qoHcHL8R7UuBgloNAA9dGJE0V2PqMeCBlrtCSwwpyf9JGH7BwdfAFeZ/1uIM/HXSiYSTWxhOj718sAzIaIAYcSY7eXaZQJW89UZ6XH0vePofJ4Usaw3lRrS6WFQHBtbR2QiJ9enRHzW632Q9IwFO5H1ce2KfaRiH+Y9JxXfMSi9VNMzFU3cVO62iDqWWyJH3GoYg==; 31:qpOjRsm4UhuOj50ckUg78mLyIpDieCmhx+3KQRi8SqHk7cqSGQolFmbMTJPpNA8nk1W245EWhRCjo/esLJzIEAjE5u+hdOwUZOiaYuDk8dBIEJeN+SbFVgrCTZlsWYIrwKkt0L9/x79zH+QqlDOLlbq10T8Mwm/uSKxsonOrLLl07lY7rpGgg+QApkn9tNWV/O89/rfrj8LhoN5R7R+A++dFQgO77WlQgoYcNFSGYsg= X-MS-TrafficTypeDiagnostic: VI1PR0202MB2782: X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(3231254)(944501410)(52105095)(10201501046)(149027)(150027)(6041310)(2016111802025)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(6072148)(6043046)(201708071742011); SRVR:VI1PR0202MB2782; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 4:Os3zpvlSkGuLzifeKFaT0/TJ9d5XGEZ2lvgiI5nSgaO7PzyfVjxNaJxp7zPXUgoUdFobLpjKVkoE3lo0fMruF5iECa6uB5EiOjI5HvOFDqitB6k5zVb0Eya1EdGQFOG2M35E9YDOItt/gCJbNZMfu1i4nVnTdfGpMshQmOY7X7dv5146zJJX/veRIKgqEzNphJNTHlpTrD/sksEAdtzRBdr1UlMcT5vmIYpmzUV4jayusXIrkV7lxLzrDDQHJgYW86kH9HZUzzRyKzCJjudbmQ== X-Forefront-PRVS: 067270ECAF X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(39380400002)(396003)(376002)(39840400004)(346002)(189003)(199004)(48376002)(6116002)(97736004)(68736007)(478600001)(4326008)(5660300001)(1076002)(6666003)(2906002)(53936002)(16586007)(551934003)(3846002)(66066001)(6916009)(316002)(15760500003)(47776003)(50466002)(54906003)(6486002)(50226002)(186003)(16526019)(476003)(81166006)(25786009)(6512007)(11346002)(446003)(105586002)(7736002)(956004)(106356001)(2616005)(6506007)(36756003)(76176011)(386003)(59450400001)(2351001)(305945005)(486006)(52116002)(51416003)(26005)(8676002)(81156014)(74482002)(86362001)(2361001)(8936002)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0202MB2782; H:orc.pedanet; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: axentia.se does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 23:G2RfoUDgjC93zDJ/W+wUts0TVuAsbExfoG766lT23mQeLmlnxUEIC6i60NEw+DfQerxFhDgtUFWCd2UpE3v9FSulWdGOxlVJrO/oBuimbfJGoE4T7/NuJK2WmFldmbKedBeIuz4YDlhx13aTJRuj0XVZTDh6rZ6LUXh7fJVLAjRgE4CZabgZi8i+doGty8c9jwr5KrhpRxDFtRr+hMVopHhaBQ3ObRDzpv9N5F0ZEeC0DfhE5qm/HtmafDz5I3mmAVfv5AO1JQQnu0L3EYuKWTIfqQziwwcmn6TKrlI4Pzk9lOYlVANfyaetOG0+B7Ci3XXwrVDZZqrxboO3GfTolva7bM3MqN4i4V3puwE7/nGwWy3sgv4KBeHmXDq92XUh3RSsl23XYmfBveciQAHwVHUqlfOKhaZXP4l34BnbHE3dg1jDsmH51wQ6DsWuKPh2ZohbLebD8jHBmLfH4ttQ0mE3XJoh9hSjyl/7PgJ7diCKF0iQtJvzA2BOzql5vxywP3Rvtl0R6YsgubDLb5Ys+njhcGQ8ydybotidYGwo6uXUp23AmpjB+lo3d/53gN/wrFxmOHXsnBA1L7I3tEAjI1p/URXe3eMs6w0Ghk4TXHLj+9N/xYjG2TwLJ5s6AOB1ZrbhQG6MCyNxXYIGlu52wiJIaHP4F09wXEDs8X0WE/tKOlEVtQPmr2CCyY6Iof5kFi0LdYNMSZFea6tp3TvHWE1nPVS09ZuKbKquaB5f2etczbk60JcP45mJxiGtbfA7IKMYJnTMKo7JRb+tfxCANshCVHfddTPSxOmch/7F+sRcIomQvpjQJaTmxyOxEJMUfCTkG4qyXDkQ5MMUx7txPPXs8uBQtWSCptw6ZGv1X9IlifV8F1Pccc1SpkKvE6S9zvkuGd/3V4x8VX2TPm5+B/ANdpIZ9w/0zJirZMo6VG5ngK+F7tI4j0m9F1+LPMUZErvdgGqgN+KLG+glufASdFcgl0kywlOPjtbwkkZpd9E2Xs+LUuZJInpZHWkbDijZ9JGSiMH3LmIKBJYoGKI3yQxUwPaweEhqmnpWd3FNHJnGBC9IloUdPKFcDj6kCq9dWXGbZ2Qq50fi3FHQVTuzftRsHSW+Z5NqreiyTCg20TZuQ9jHGfvHELZTVoBP20jL5E9so5jstL+L6Z4FS/xOSp2jtDazXVxLolLrVLgh6zL59spc2pXpeLSR1+6K6bF5K4BO0MT8PfKgtCwW01gvSH7nUIimyNBeuJNhP7Y8b+ng47JJvVsApdlBg1pXeoERHfpB/NbBrcvKipvH3kEbuJuj+phu6//5WGcKbLb0UUOTRsoEK26OEi4P8lgB5vO/c1bglbik3cfhR9/ykg8uTwMKuyDIA2Ea/e8zson5llw= X-Microsoft-Antispam-Message-Info: bP0YY+FW9Zf0CW/efZFndbBXwYf7nwVmdbxEA7FdqSioZpd67vplq3AO9YKr/Qb0KWIllsWKkdnQD7l6149u/uzQyOip6vrH7vDltILtN++ebVblrEYU7qr8bkMQOcHu3u2GhbvPSFqgrGu7FUisvm0cKEC/L1Qh3f+W2JEaBIjcFvm4gfxq5HaljvRoCHxF X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 6:aYhFkBKDUoVdQgOXQopOLPyyc57gTq3cKETUN8peWeaA2NXeIEro9ocSJSN9UMaI5aSuOGp2qOO7NLaV9O515ei9Kmg+rYaL8udjVGXSJVQDk2WBOcai8JGdkonsKZkeSchihdXdB2r3brKwuWWuXcNCxJQhtGBebNFcuqTLWw5ybPWUQB4OX0qReJYwx6ydT6qnnTHqmQ4RoxHtbO5etQDMUCZUUJj43dsBqgIcjbJtNvnLbYvG2HhqO5JiyUsGV0dk4BUkFsIKv4V2N0xKaH0igJTFKogqmugjfVSMbhRJrMmkHPlTE7ewqzSYdFrM1r3sJEVORdR0R5Wh2PjoTkiWnpUR9YiK2LLHnVpADsVN4W8qOKZj7kwJUEZ/fIAHLppdpar7WYDCxEJsdMXINz0rvnFfv6aG7wNjL3GmOa02aPnon0lDpjJfsOeIFNmve/deNboUE4jXnM0UZjvFOA==; 5:j3/0ljwy+2OcpB6VK1VtUr1VKDHyzIOVDdkodz58Jl3YS5clW3dMxhWGAqz4yOERrExkp0EZKGnDcf9N+d6EGzsBooqHUSLgXQqNCCMyS5DEoRwSyGpCmz1cyQGDRO7VdXa2nKmdC+n1TQ1Q60iuiXwJ7lPzvz8NRqTfvaq6nIY=; 24:kjXevyD+DMOjderPR/dCWgKTbF2SlvB0VNzNnyYby5pXUI4p1EAO0/EHa27pHcpLjuAra/eG5vwRd1R/vZLAjeHvPpWmcQSzNOhTKhZqkJs= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 7:A3dugPAwPbnMwIbqhNDHjCfx+k4LZGd2JrDeuuedn+mr0lQ+XC9nyR7VzE7kyHxFec+dp65FTVOikCMyR0bhAncvZJniHYRl2RnZ+8F1ghuwMNqN+m0MB9Qs3NXPgNGzjgiClQuwkWw9FhPT5ma1wrdTvHFMWPHYlTZZsSQdOBBr1klbO0SUlRdex/94BRDajN1FdpYq2usV/tLtNWR91O/zZ7jX3V5j5qHBXB3Hl7LOKPWvAxkquY4nieeY4/za X-MS-Office365-Filtering-Correlation-Id: 526099ce-dd87-48c6-3d12-08d5b9aa9977 X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 May 2018 14:54:30.9506 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 526099ce-dd87-48c6-3d12-08d5b9aa9977 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4ee68585-03e1-4785-942a-df9c1871a234 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0202MB2782 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Because it looks neater. Signed-off-by: Peter Rosin --- drivers/i2c/busses/i2c-emev2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-emev2.c b/drivers/i2c/busses/i2c-emev2.c index d2e84480fbe9..ba9b6ea48a31 100644 --- a/drivers/i2c/busses/i2c-emev2.c +++ b/drivers/i2c/busses/i2c-emev2.c @@ -149,7 +149,7 @@ static int __em_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msg, em_clear_set_bit(priv, 0, I2C_BIT_STT0, I2C_OFS_IICC0); /* Send slave address and R/W type */ - writeb((msg->addr << 1) | read, priv->base + I2C_OFS_IIC0); + writeb(i2c_8bit_addr_from_msg(msg), priv->base + I2C_OFS_IIC0); /* Wait for transaction */ status = em_i2c_wait_for_event(priv); From patchwork Mon May 14 14:53:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Rosin X-Patchwork-Id: 913004 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=axentia.se Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=axentia.se header.i=@axentia.se header.b="tlVwUors"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40l3hd5MKyz9s0q for ; Tue, 15 May 2018 00:57:37 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754035AbeENOym (ORCPT ); Mon, 14 May 2018 10:54:42 -0400 Received: from mail-eopbgr20116.outbound.protection.outlook.com ([40.107.2.116]:36671 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754001AbeENOyg (ORCPT ); Mon, 14 May 2018 10:54:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axentia.se; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=VgBwvkOVEeA4kFRC84+QI11s3YhUv2Eve9Ycd1hn/g8=; b=tlVwUors3XR9myJuO/fiCBwHXaoNwbzmjqtWSX6tT5GrQk7srtBnCyZBkVkno5arLJn1aYzUYf6TIzmyrPTUcBiXMjBT4hG9ksNoY4lUX0Q2uEi5OxwYEVmGwbpAZGish2FuZu63XzVussR7HKfGHswrc7lnPNJWT+MAVKih83Y= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peda@axentia.se; Received: from orc.pedanet (85.226.244.23) by VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.755.16; Mon, 14 May 2018 14:54:33 +0000 From: Peter Rosin To: linux-kernel@vger.kernel.org Cc: Peter Rosin , linux-i2c@vger.kernel.org, Wolfram Sang Subject: [PATCH 10/21] i2c: hix5hd2: make use of i2c_8bit_addr_from_msg Date: Mon, 14 May 2018 16:53:19 +0200 Message-Id: <20180514145330.4857-11-peda@axentia.se> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180514145330.4857-1-peda@axentia.se> References: <20180514145330.4857-1-peda@axentia.se> MIME-Version: 1.0 X-Originating-IP: [85.226.244.23] X-ClientProxiedBy: HE1PR08CA0043.eurprd08.prod.outlook.com (2603:10a6:7:2a::14) To VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(7021125)(5600026)(4534165)(7022125)(4603075)(4627221)(201702281549075)(7048125)(7024125)(7027125)(7028125)(7023125)(2017052603328)(7153060)(7193020); SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 3:lylTEIFpxS5DV+eRGqV1oIVwYThM4btB77k+Wh5cJG4iLvFlxcMViAe7TgnyAPJuqPkmmE7B3GfGpPNrlDaacmJPfxO/SMCq/jS1F10vAmPtCwSaZnXProssyOSN2BlUJfDuk8HOSUBi+1Tjjd6/ck/lp4Nh8dSdi48ER7Z8wHUxLoj0KomLNusTEVHL1CEGfnHwXV7dlGsLVbuqIbcWqsLr4oexkZ65zEbnEQ1pZyJAO6xPghbAHehN46kPX1HH; 25:TIY6NNVhPRpMupvpBw1iK4jGRzL3Apu7CO0MyyXH0fMYltfp8MNu+TnYAJIFAFNheq8LswpGKKDrSmHDlC6amQWr9gC103q+X4zd1me6hiL47VHUW8QKvoeNIGZ3mgjWx0rQb9bltgonJF/hd2b1h4LeEHUuWYfBAcKpCW+JO35rHW16LqNH4tc7yMYXEdvyVIvXSRyldgCTF0gGAK7LjNX7zD3zA+qoyZx5xwUaIyyguJ/4fqaEKlCUAcNKUZ/vNKtlW4AHYPZYNc/ZNh9mD/91queqK3bDSHgILS0J6hDa2cojqzsd4u9d9Kk0vBAnjweI2UAY0mJKzG08d4zBvw==; 31:/2BtuP8HPHvIA/yNjl6ChgtVKRkK+5XIn7lbBDa49cpFkH/9W+B5SSHxMthNyHFXZgLhZGA/rnBU36/fa25YJTrR3GP7o43WBGCw846LifQFWOVOlpsmrGhgyLvZJmz4NGqM6IAuX9+VDF6gy1bJ73SiSzFoomX9dTf+XMNO46BXCKCNkdkAnA8S05u2ypE6mYav9dd5Ik3GsW2B58Jv+tRKlpoSpu6QdGGeGeNRWyc= X-MS-TrafficTypeDiagnostic: VI1PR0202MB2782: X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(3231254)(944501410)(52105095)(10201501046)(149027)(150027)(6041310)(2016111802025)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(6072148)(6043046)(201708071742011); SRVR:VI1PR0202MB2782; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 4:5rgPYLY75W4nYqpr9DhL7hDWTBBHiBr6T9/oH4U/72JWjwDcKvTtw7af//fjdd2qB5VZmeg4gNeyz+vFLNYzpadulVl2a5clk5JJhfm6lWTg6B2rlt10gyIQ1lQRW2xazW7Z0snSvbPotCjruicudpLDo2ym0RT7v/nilu2X8d3iZwENMxmgC7arZz01dVBqCHcgUR3MirciRNbnEQeyFyp675TzDEx7s0epd5Uhgfwigl0cAbgzZP7CGoZSaAgCQOIWzOfL6mH+88VdCvLXDQ== X-Forefront-PRVS: 067270ECAF X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(39380400002)(396003)(376002)(39840400004)(346002)(189003)(199004)(48376002)(6116002)(97736004)(68736007)(478600001)(4326008)(5660300001)(1076002)(6666003)(2906002)(53936002)(16586007)(3846002)(66066001)(6916009)(316002)(15760500003)(47776003)(50466002)(54906003)(6486002)(50226002)(186003)(16526019)(476003)(81166006)(25786009)(6512007)(11346002)(446003)(105586002)(7736002)(956004)(106356001)(2616005)(6506007)(36756003)(76176011)(386003)(59450400001)(2351001)(305945005)(486006)(52116002)(51416003)(26005)(8676002)(81156014)(74482002)(86362001)(2361001)(8936002)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0202MB2782; H:orc.pedanet; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: axentia.se does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 23:T3atwzAQHak0eUZwWHcHmDW8TA/RDhFPwgUNZtWeM+1zAAXfFV5PJFTeefkgDlfBkLwyjui/XSqMntklepnDysOaF7jOSXpBQAGePSCynIOpeXcSudcSn6EpxO025r/GkiBPmjWeKfDnYf6TopHuGnmIAvZE1uDdGyrcRhoeu4ESGkVzCmeadYjUJbma8Fc0TV6CkhKBNYmQLREl+CQ+AAN/fXjmY94aXnYc/2LasCOMJ4pW9PE3hXyv4HKSqStZLccXCClxGk3BLIE72X5hOUgDbx//loU4YuqE6MFacusUALzcNEcANg2UI73o9RHGQQpBoYqqHkYQ5OglPriKxbM2FHeUe5Whh/UHFktYjpSXShjxOr2ODXC4IZIufpIDQkbpEKGyRgq6CGkaOj6VKR37vqPdSAiRPhqiBtM0rgkJAVD8O7U5evyNUOxi8MfD82fxEK7bYx/RphgZBLPSNuQqM8iAtuRU+Idssxo6+Vx1ij5x1NF8Bj+ULWdC8zgMjSKLMFYOMKdp9/lf1o4xDljdBvL/te6+AF+phAARxWaTz9J/Apt+rWWvyiE8zL1Hds5OOJwU+UzTni6LolyPamBlOfA4IlVXtAv9zzkvp6ZFyA2ybOoiKJASmS2f6NwHZamxtKKyR/VjAI07Om3lLYpFwXGG3RwcBu7B5qQHZrn9JrS/Hz+Rtvcg0SE18ZJuCtJ0Wi7s8pB52FNAg8aWE0bDMvMt3valGQbjGk5J+D1gz2IJarmFFsvo9R1PdMezFq3HgJe7Alaudq+zascSfV6/1c0HGh9kN9A3W81h/qSG3m1ABFE4M+HPeJFG/i1rymf0Opt8ZjTik7GqL/cxNA/kKxguU16Svdl+lTMB9K6rAlnEF+eef1/qYZ4FVZfVsH24SPBR8+hb7wLamiFGrV+fGBmnWWCWlNmQWpJoEq/5WHNExWU1pZBxyoWs1HT7vaKuLmKoSHkCITlHy/0OD/DvUyXNVLFxjn2BRhAyPd85OM8s5Q4yujiGCfDYXS5gbijErBfkdmRgujtw4VC8CBlUWAZffkSx6DdQdrvLtD+hIq5XpYVjLkwAcsBXO+VI3J+crS/7ODxuprzmzef7q8HimTN1gJV8donG2TQKs1Daw3GcIF1UUUkC/SHzXjPapzWJ5ibYmSANSw5t+PKYZGkbbzJLPRDs8kt2z3tITVEgskrGOIPIhXtB2SIdYmQmhO3/vORVLWqywWImo+0/VVmPuTljXmNU0kDrn+0vtlh7iOqa9O+y6kiVvNLL3vxnkHIEkPl+at0IHpy1I5iDP9Z9LvTok5pSTHCivnetyFjYP6LhlFwyBcpVVr/R/uVODIpgNkx8a2ZuvOBxfNv2lg== X-Microsoft-Antispam-Message-Info: 0butQ/DBcnDKG41Yjt6czSh7Dzzn5bZ4815fdCYdfetRGrHURUXT4hzOeKKE8b+HGKDVigivqxsIdga0a6uMn/Wu27DGsEoKR7FkZ+Y12GyagYskVmaGHkUFTsYuu4uJatca9WP/gnhuOA7NkBZt8Lhy5zyr5oiCKkHxIRGSADnQcZWj2Nj/jIxlmCSq7yty X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 6:K5esNBr+CaO1UYcHHnh+88mE7CNqxmTSwUUhy/R3xRqLsxb7dACPa6BWTH5rz2SS29bnCrpOoQeG7dpWw73S5tht17aCfGjalVY7NSoBEON1DQdPKZDvf8UatIaNfyj8uSAgJT0PhcT0WKrtDJN9cHxBrs6jpGYeQo82lAdX/YaiyR/0Qxj5s3NHgtF0SANIXuVmydn0wL5ASZaGEj96W839cPSoUamiZIlNBdEVC3GpP7IoKcu+jpUwY0DkaqEHEycq91VOxhdMDZO6qzD9/UiEjXizBgR7Nu5+jx3YkGWBBiMbdguBCfgwK3C8z452GH+mjnK77P+LrWALVxs/IK4xXWIH0glZvPFBwv8JnC4jMlebELcLVdQD1KvnNiUfsYcjRFpQ9ZFLs/2oBlgncooskZiebiyh2lClkabd7SQqoXbKiPyyqIZKtbk4S10bWLOC4E3uYmBFIWO5AXWvJA==; 5:iLulRaWiroOcZ6BD/81RpI2CXwdgH0gg5bfq4lIrHA24sFf+XWZaVqDXfebaogI531naWy5481TkH2JwXKCAqkqDL6U7kSfpTSLwOGU95rz34D0MAuBoDLM+7aUWTffy7xRHXpmXlcS5sHKXAaCtPhGUpGjp9GgHFOCfY/FVBqM=; 24:3S/nrJ1+JO64ScsVn8Cq+BVxntKeH4+TzDfwQ2sjctvj2vmhPhYt2il1wDdcFIuiKVFOO+QJygxW7U4hOLEqMxsOMlTsVJHp+VfXk+LlpL8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 7:zIZ2EKShFkEphUgW3aS4brIG96cW5PjqG42pcMdL63eZUoLGhIgVeA4B2qkTimKTQVGSDyr5PZUcy3WwhqqS5qBKmFxWg8D6WgxrT8jT++xUUDqpkqyK1wxMMn9eEqxn2A1LnNkz3vcBEBQ0MrU1WTi1n4f7MjtCF538QYq8kyh0quW6dPTlbyxakxUlTng+hBRDjDdbYBLyxfB0fLadtKSsBinV5EUWs9O2LZ3LIsNh3ILADJCLoas7zZwRBtHT X-MS-Office365-Filtering-Correlation-Id: dce97c81-ebd5-470f-64fe-08d5b9aa9b24 X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 May 2018 14:54:33.7475 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dce97c81-ebd5-470f-64fe-08d5b9aa9b24 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4ee68585-03e1-4785-942a-df9c1871a234 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0202MB2782 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Because it looks neater. Signed-off-by: Peter Rosin --- drivers/i2c/busses/i2c-hix5hd2.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/i2c/busses/i2c-hix5hd2.c b/drivers/i2c/busses/i2c-hix5hd2.c index bb68957d3da5..399b64c4c620 100644 --- a/drivers/i2c/busses/i2c-hix5hd2.c +++ b/drivers/i2c/busses/i2c-hix5hd2.c @@ -73,7 +73,6 @@ #define I2C_OVER_INTR BIT(0) #define HIX5I2C_MAX_FREQ 400000 /* 400k */ -#define HIX5I2C_READ_OPERATION 0x01 enum hix5hd2_i2c_state { HIX5I2C_STAT_RW_ERR = -1, @@ -311,12 +310,8 @@ static void hix5hd2_i2c_message_start(struct hix5hd2_i2c_priv *priv, int stop) hix5hd2_i2c_clr_all_irq(priv); hix5hd2_i2c_enable_irq(priv); - if (priv->msg->flags & I2C_M_RD) - writel_relaxed((priv->msg->addr << 1) | HIX5I2C_READ_OPERATION, - priv->regs + HIX5I2C_TXR); - else - writel_relaxed(priv->msg->addr << 1, - priv->regs + HIX5I2C_TXR); + writel_relaxed(i2c_8bit_addr_from_msg(priv->msg), + priv->regs + HIX5I2C_TXR); writel_relaxed(I2C_WRITE | I2C_START, priv->regs + HIX5I2C_COM); spin_unlock_irqrestore(&priv->lock, flags); From patchwork Mon May 14 14:53:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Rosin X-Patchwork-Id: 913005 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=axentia.se Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=axentia.se header.i=@axentia.se header.b="KcZkLIzf"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40l3hn0Gsrz9s0q for ; Tue, 15 May 2018 00:57:45 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752544AbeENO5n (ORCPT ); Mon, 14 May 2018 10:57:43 -0400 Received: from mail-eopbgr20116.outbound.protection.outlook.com ([40.107.2.116]:36671 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754027AbeENOyi (ORCPT ); Mon, 14 May 2018 10:54:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axentia.se; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=+6TyqqhEJ/+Li/5vYuQNuCDSmC48IchIbCTwtzZpzMw=; b=KcZkLIzfgLKZoJl3zZXDkHqP/fEtS66ybs+pznYb+lUkjxmfEgk7/QJuJyuE11gryBLln5emG37SVgStspwSIXHMzwFKFkmLNMz02oOWQ7foufiVIQVwAoIduda9x51PyxGY1n1YdYmkOg8jSrbrhEEnnr1FwJmSFCWBfikRpSw= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peda@axentia.se; Received: from orc.pedanet (85.226.244.23) by VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.755.16; Mon, 14 May 2018 14:54:36 +0000 From: Peter Rosin To: linux-kernel@vger.kernel.org Cc: Peter Rosin , linux-i2c@vger.kernel.org, Wolfram Sang Subject: [PATCH 11/21] i2c: imx-lpi2c: make use of i2c_8bit_addr_from_msg Date: Mon, 14 May 2018 16:53:20 +0200 Message-Id: <20180514145330.4857-12-peda@axentia.se> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180514145330.4857-1-peda@axentia.se> References: <20180514145330.4857-1-peda@axentia.se> MIME-Version: 1.0 X-Originating-IP: [85.226.244.23] X-ClientProxiedBy: HE1PR08CA0043.eurprd08.prod.outlook.com (2603:10a6:7:2a::14) To VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(7021125)(5600026)(4534165)(7022125)(4603075)(4627221)(201702281549075)(7048125)(7024125)(7027125)(7028125)(7023125)(2017052603328)(7153060)(7193020); SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 3:Hl+Nz38+nVRryCpjXyQzrCd355/NEFpmKGgcFzAyCp1xWgSRpPidiTDiy2WU0jIbFc9G+Ns4BhFaafOY7I4m4rFHtMkUm516baU/FERyGqL+fKArV+zoLj3PCRt+G4K2yZncxMzE3indYjXBk5UvQZjcAVVzRYoWm7tNbvrSvNGqnVRHOmaLtvxo359pQBtHNMJ/7iTTFw6zMnl7IsOef4tv9Y2X+BHdS4dmas5Jb3bJ3zxw6ps0EQSb2qVimrtZ; 25:4rPMEUBhh0rAaQKxm1X9Sym4fTKoMzemVpFnlDLw33bDJaCGIwFsiSYmd4AQx4PyhJ5xDNM3gmFywP8+MYrCGMJL9ksgsA4km3eF3LRXqUWt85nTt6QhRQCJekREcDi94h2RegvoAEGjEhQE4Jh1wdwPexN2CXEeLetQFOyUYQ3HA4S3wgQFhUtZ4aO5WfEnmC7sq1tWmKwerTBAWwkBvIef1s0SmZDhgPoG9rmpWLsrgBYd59V2eiJwm1Jpp78T4p36ftwPkFOTnZ9kU3v8lKGz/h7LMO0rRQj3mcD/RW0i9KuycBi4D7ZHf7yvlgTFpyQeo1U+R3BMOye00BsgjA==; 31:+cOkD+Q+FA6JObjIJ2Ihg+TnNi+auK8Pep4/A8ruAS4S8tMZUCoK3ZZ4jbmdMh6PdkpDSfLNdGec/yu+e7nKxctBRSq/otQWDyrTuNO7q8S7zjFfTRiAn7c8ZdyF6JS6SaRSOs2yBEjw6NdJ7WA1Jc/vcacassbmD5ZuS3ubhoXri0kwEcxPJcXRIYKAciHWT2+AP5/mhsDiDV7dypN0QLiRAIxeh8QKFDuenXaj7gE= X-MS-TrafficTypeDiagnostic: VI1PR0202MB2782: X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(3231254)(944501410)(52105095)(10201501046)(149027)(150027)(6041310)(2016111802025)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(6072148)(6043046)(201708071742011); SRVR:VI1PR0202MB2782; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 4:tTQcE8sL4ucSRT6+Mdbl1YE9QMM907uMAoexNHi4d/YoLCDl20Sp2KH80CZMQq2TzyyWzvBA7m87e4kNYNhMuzevKSaWK8g/v3BqqIF0wThV+F267xRq2DhWWk2/DMbEEPW6KE0wR0YmZ94LpPA02u4nSGSoZKYGAJKo/O1/Ii0INwi2TonVcreoQaYkiJS+pUYP+h87PteyXGx6NbUbpsv9E8cp+l2ucyIeLkCO71A5zx+fCD3DXxDiL1InhojvRFMF9hSo1f7rdKC9Kr2QOQ== X-Forefront-PRVS: 067270ECAF X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(39380400002)(396003)(376002)(39840400004)(346002)(189003)(199004)(48376002)(6116002)(97736004)(68736007)(478600001)(4326008)(5660300001)(1076002)(6666003)(2906002)(53936002)(16586007)(3846002)(66066001)(6916009)(316002)(15760500003)(47776003)(50466002)(54906003)(6486002)(50226002)(186003)(16526019)(476003)(81166006)(25786009)(6512007)(11346002)(446003)(105586002)(7736002)(956004)(106356001)(2616005)(6506007)(36756003)(76176011)(386003)(2351001)(305945005)(486006)(52116002)(51416003)(26005)(8676002)(81156014)(74482002)(86362001)(2361001)(8936002)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0202MB2782; H:orc.pedanet; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: axentia.se does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 23:toF8VKeSLzeVmziMjdfuOdFLop6yc8xsuXUvtnU2b9b8WuM7992AJT0MPDk1jErEcIw8W7XI4tXaL44GVQSNZxntRr0uuRfJVAvVTz1A3p/FlDrX1SxukE/Y8kI4ldYfclaCTZ7ibjrvoSo+1yR1JTT/Gi29OhzmxwzH1DZibwFC4ha06QouyIHinIpJ8MJlSI8fMkrnvRgIGJY88zFI7mNF81Gx9AGF/nZ/qXRI95h8Nal3tYgzDZgSffAMUxgX8CQPxwEXWxdwbyIEbfaMPnrI317QQjWnHwIMysKFe7ipRv2ILYkQIOFp6keTue85LQ1ZoItwIbnFS2MH9rcd4V/DlQYse+ZVEqZ/TtrBlpE1Qyei8HNbY74aKJzlCHaxMgwhW9yIuhzE/xrv6BAUtvQrlZ3lEsJpYhMNanmFS7rnUO+0qR5hNAeGTYLkwYwrzIHizOaovJdpcL7GF3E20cb/eJgSmwV+m3ZOMQ4H3n3BJVET/zxtePBgqHuxUeeTj8oXPufu6FITlveA4GWwbzBSw/rCKyaQ0X2Di4r+OnyRaSkmVwBDZ8LEdOUVnp61PATZzRm3tKetzDbNchwdLtF+zLuKYA/1pB3tEnPzfGfumJR7sZXfQ2QxNQIl1lpCdv9b/o0rT0QHzWW4UlModAhAb+9TYR3rqO4T5EHA+IYr5QrvtqvbUm0JqNE+D3mJKJl+7t0xtKTsvQQrBP7hSAK/3qxx98oYEsV1By+0LM1XBPPmP/HHPBQwwnEcNeKrDpRB6wsSHxV5FwUeleXb+p5kvJBdD69iCFWSFNhK1GiEn6Qp4+e7WHuBxbmLP5ie3VIxy9jxeGOs7aSRuElfTNtLmAD+cvDC/cxrdh+nSlR5ZM7eETznaFkd4YbEe75pIMB23qrzWbIJr/PcuwnqL07W560p3A+pdcQD8Y8cSWmlIvduKxGKB9K3qkp3DPA4qN8QFvGyovQ+cW+e731no/TaosZ50UngejHJAfY7Ft1gMvKWttHO/wIklVO9N1Q7N4+AkxUkWW/XWAjXhHXbnxACHS/2j+Iei6Mi2F19RMsaSgHO8EcIUbQeFstcnR6g4DRh4OvICRu2tM3jLNjTDUkaIinBs6NsfW3SzCp9WS8YgT14nX+o5YntRvjDPcj5LRG9uLMLyIrReVZW7to+27dI3W91+zhCAxmGbBC1tL/lYNNhdo5K1BWRGLAk68HWmt8KttdW/dgCRoUAXprZ/+RFfb5HwPJe9EY4i4ws8JEIswYuJ1Wour99Fb7NqdoHtVgGTSpSxdbkaB6rySGGqCnVIN+ykrkHc14qCO3Ul2yo0mA+5e4k+sV1fIHybM1p X-Microsoft-Antispam-Message-Info: 6ekDAVHemOVGgVPK+1lajY0BlDzpBUNTOCoDjdkxPVNDDN8cpY+ASitCwbu7G5g+lJ41UfbJQLm4nIde1u2ZgzsGnLPdZBoDkSLzF57z/7BKzCaF6Ylt5j63rj2VoH4sBPGjgL6SzDb7qKzZW5HNiRPbbZNRMX+1nBnkcq35jdrRtu2XwfviLXY+RmVZTBOh X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 6:rjAvtFuGnZ0TobRY7/w6UKzhyutF9v7yvrpBxKC8BPvIKmyaYGe8rDk1myymz1kBreqGqt9J0usZCJTwqxoW7lluoj60oOiKezOIc2De91B3crx0ZoQ0sgsTDkdc6bMz3sVVCzCtm3/JWtadkV7wmLufrqkCekvouG8TnqLAUVBrNrIBIeX0lDrBrD1tJMLTvoS+sFzCWs8L9oyPAb6Il+7yeCL3q7e7bZzHBUh7XKxurmQ+KNXEemU8fOhN73oE6Q3Wm2BLUAkWh5UqwD5yIdtJMF8ciDvWQB/CkY72Mvlbzbk+rr9Yu726aMJg1aeVaEvSauCAPEgwGQUjFWIaK6RAtmonUchrOK6q8CxgJxB1FYqfU7c2LxJGXdrC+cC44AZqkSiYRfCos55sR6AhNTNYeiWNkzebxA7KDB7zhPZmqBXRNxi5GFy4t/JhsTh+hhH3Tzw7ov/qZwMI6dO5Wg==; 5:JzC76ME+xJ1DGjII8ZDRVq7966mCNrZCbyoir+7S52oMxZhwxdnFHoXuAlHn/8eG57fVBDMgNZGJdaVk+v9tAI5tyRItwOrWgmicir9YRzI3U9uyS6rNtYfpZf1e8O3huerKVn838YbMRG8j3R54vZrQzYdSGdeDx/nUN9lWAEg=; 24:P9IifktsljVnepL8RTv1TEhO4Q3mp585EzndbuGNwDBktDHYiyUGZCL21h+B9S2IM1CuH+/Gcy5+HK3iT7lm+q+OWLBpFpwd8GHrDCytp/g= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 7:STYfa++oNIoMkcWw5qOGim5FAvLICZ2XdRaNcEiFprsyEbSfiSDg/vVDGxYhRBo+AznVdO7XSKxtp7MCxJtvhURX7qASpZax7tXsrsG2Tc/hIrECuBjoTGG7EdH7Ws/TFpU/K0LN81UzGDps3kp0S0GpurJwl6FJ83+1Rpn7fPc81KxkfGsJPlgnMqmh3H2p6Wl7G1KR44JcrJoX/MBxAndPWCXxL8Ay7lCiSZ13YuFGZRqWTk9MC9Tf/UkAn8QF X-MS-Office365-Filtering-Correlation-Id: b4122574-79a6-40c9-27cf-08d5b9aa9d0d X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 May 2018 14:54:36.9507 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b4122574-79a6-40c9-27cf-08d5b9aa9d0d X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4ee68585-03e1-4785-942a-df9c1871a234 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0202MB2782 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Because it looks neater. Signed-off-by: Peter Rosin --- drivers/i2c/busses/i2c-imx-lpi2c.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/i2c/busses/i2c-imx-lpi2c.c b/drivers/i2c/busses/i2c-imx-lpi2c.c index e6da2c7a9a3e..159d23211600 100644 --- a/drivers/i2c/busses/i2c-imx-lpi2c.c +++ b/drivers/i2c/busses/i2c-imx-lpi2c.c @@ -180,15 +180,13 @@ static int lpi2c_imx_start(struct lpi2c_imx_struct *lpi2c_imx, struct i2c_msg *msgs) { unsigned int temp; - u8 read; temp = readl(lpi2c_imx->base + LPI2C_MCR); temp |= MCR_RRF | MCR_RTF; writel(temp, lpi2c_imx->base + LPI2C_MCR); writel(0x7f00, lpi2c_imx->base + LPI2C_MSR); - read = msgs->flags & I2C_M_RD; - temp = (msgs->addr << 1 | read) | (GEN_START << 8); + temp = i2c_8bit_addr_from_msg(msgs) | (GEN_START << 8); writel(temp, lpi2c_imx->base + LPI2C_MTDR); return lpi2c_imx_bus_busy(lpi2c_imx); From patchwork Mon May 14 14:53:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Rosin X-Patchwork-Id: 913002 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=axentia.se Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=axentia.se header.i=@axentia.se header.b="QQZ+RNIH"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40l3hH3nWNz9s0q for ; Tue, 15 May 2018 00:57:19 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754045AbeENOyq (ORCPT ); Mon, 14 May 2018 10:54:46 -0400 Received: from mail-eopbgr20116.outbound.protection.outlook.com ([40.107.2.116]:36671 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752078AbeENOym (ORCPT ); Mon, 14 May 2018 10:54:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axentia.se; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=Pu5E/WwfPmti+iS0zrz6IrW5ll9jXmDnUdaV335HrQI=; b=QQZ+RNIHUcRUBqIgNBA0OfNTv6nhsiB5MED3LIPoEQ35rP8GkLSUnw8ckDAHG5qHubyHPRQDiArHq93rFWuctLWhm76z1P07lr1VPwLvHSaeZX7z1T2MU9zHVQ/2QJzvz1RN4LaF/acasab8QGFPyIN6g3kFLQ+uu1TgkRX+Cho= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peda@axentia.se; Received: from orc.pedanet (85.226.244.23) by VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.755.16; Mon, 14 May 2018 14:54:39 +0000 From: Peter Rosin To: linux-kernel@vger.kernel.org Cc: Peter Rosin , linux-i2c@vger.kernel.org, Wolfram Sang Subject: [PATCH 12/21] i2c: imx: make use of i2c_8bit_addr_from_msg Date: Mon, 14 May 2018 16:53:21 +0200 Message-Id: <20180514145330.4857-13-peda@axentia.se> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180514145330.4857-1-peda@axentia.se> References: <20180514145330.4857-1-peda@axentia.se> MIME-Version: 1.0 X-Originating-IP: [85.226.244.23] X-ClientProxiedBy: HE1PR08CA0043.eurprd08.prod.outlook.com (2603:10a6:7:2a::14) To VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(7021125)(5600026)(4534165)(7022125)(4603075)(4627221)(201702281549075)(7048125)(7024125)(7027125)(7028125)(7023125)(2017052603328)(7153060)(7193020); SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 3:sHYPZkc/irYcxbJvjKfs9OtDF8tnZ1Qf9+XW04+sy1Y/Mxl5bK14/iGG69TPrjsN+Vnjvz+jfFP9a5zoQmGM3I50uXKKgsP8UytNVX9BBdEwxOYflp7F0h7m0n64zdI7LVkAyp0KcfIn9gGJ4Mvclm430EdR5Wz+W1HR7nDRl8F/gxvFAXO8L7Y3xGYxO27mVVewMwHWLK6D11UH89ym6eIZZ33dZ2pusfmm/10c3Pe0kKmA+YZuybHI3c/OCkJa; 25:s+ifTMeqvxoCXi8Co0AP7RCf3/6qfODh3WpUV/+fijxSo0ifz1SUfNndHWwjDTyfV/FYRXxJgLJKX6zyP1vuJBdney2JoP5bu6pTXZwrBnpWMZlaXLUmqPlYGqz8hTjf4+dfyuzi9BGAAjn916c1D6oYou0wbdNN49RYYH+yksWCJWxaMkEOj0Qd0Z94JokCPRX4Cn3Hl5398lmv+lX59as3jyvsSZqRsPRcMDIygYLLxAPa3hw1jHpT+d3U/sCzhwRxtg7/gWSwBz2UChkcq2Xurrwg57PoAszrhbSX8ZVTOpRM1RMOb+CO1h/0x9TgEjC4QZQ+/h5JcjZjAZqTiQ==; 31:VboZNL4c/b03rUy4N9VeYbHau7vK+YN27T5oXt9ZSdhqv9YnpnySBwyV7VJkadjfB8ulweO9ecnciauJyfk8RyRUi4w7tUoaUZ+Q6BkNGV/Gz1Pfo9WPNv0Qr3tNS3iiAkocGsQzNXy1NjCfWV5fU2HqO++kWx32HgHTZ5heRPzsTZ5pKHXduzPIlZz42fZIYPhzFbJBIq/MbOA/xPQVkdbIYgc6/lPBpvRrI46jJdQ= X-MS-TrafficTypeDiagnostic: VI1PR0202MB2782: X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(3231254)(944501410)(52105095)(10201501046)(149027)(150027)(6041310)(2016111802025)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(6072148)(6043046)(201708071742011); SRVR:VI1PR0202MB2782; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 4:OGWlDxZbuH7zk/n6jOQnbkMvfpGBLJjFGQdu3885Cqa4sCxVRL0Pq3qdM1GkiehXqbAZXQaOCss3vp/KtIupxYktAJo1mpl2J93wJMbCcq39KeJ0W8RHi8J0L3ntxUSbu+07cj6uVak3xUEAS3yvVmB1Av1QXZ01yE5B1vIuysYTPaTmLyW0eZhXezT1TEMsOIqPdbajRq6tFgm7xHnYpS3yfVdT0NnirMT+xs7HvmgQaF5Svw7ovTemyn7x//R+GmPKs8FamMdgwEaXIpE3kQ== X-Forefront-PRVS: 067270ECAF X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(39380400002)(396003)(376002)(39840400004)(346002)(189003)(199004)(48376002)(6116002)(97736004)(68736007)(478600001)(4326008)(5660300001)(1076002)(6666003)(2906002)(53936002)(16586007)(3846002)(66066001)(6916009)(316002)(15760500003)(47776003)(50466002)(54906003)(6486002)(50226002)(186003)(16526019)(476003)(81166006)(25786009)(6512007)(11346002)(446003)(105586002)(7736002)(956004)(106356001)(2616005)(6506007)(36756003)(76176011)(386003)(2351001)(305945005)(486006)(52116002)(51416003)(26005)(8676002)(81156014)(74482002)(86362001)(2361001)(8936002)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0202MB2782; H:orc.pedanet; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: axentia.se does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 23:vyccSqvzItwCjZpyvWkDBDwHr42pLPQmD6rN5Xuqrju6TZC65vigIhA6Num02Bk6qGUY5SQCklZDH30yQM2c75bb7qkD/5dMtbw1tcJyF49DESag1xuruaahazdQuwSsqFYHPKmG6FNTCQLrlL+QN+5fO+VcYGZ2UT0ep5xzo6+PxO3ZpdO9B6WR4KbKz0OsJijAHL/ILp7mS7v4Yf4WFOB0EpartJ0tw80G0ZRXRmiki5nWnbje4A9LHKGh7BpF34tzN4BPn6ycUN1emhPRqsRmFZ36d866v1AigZbHsp6PNKBdvYTvKxKSLH6DpVZQLXP5F6ubuTvh7U4VF5uAE+tLhSVSenuWgErefxxmi0P6aTVE0oWUTABShLpCRO791amaD5m74CM4zB5ZNbSLBVJNb9al1INzxy25Sk0ZpaQI+ReoCl3dFHzHJYMKKkj5fIcr7Gzi2qP8eC8Dc8rwSbTzQiFyDK5lph3KsTKxVK6DtY1G0jpIviH0GnEYX4Srbl5C2XjgMAgX0F73AEQUZobywov2O3P/NjHSSvvNz/ApMtxc9b0lt6vtR97Dcs13TjFdimw9R7yAXP8WGXIPYfXV+6R+meg5YOvfWttB1scTKa+lyg128fpRkvGZxmSTr5pWH+D3IHQ129Nd+pgcJMFFBbWr4vynkvZnJnaFXqZTorhvF1eHYcd1vM7nFm6sDcedSzNfgYtv6n87yh9i9LX8h1czU+tLE15dd6xOKnpD1KCN26g2/QmK6GTqmyXQFlHDaaBg71+D8gJi5Um2UJz+pIy07jzONBYOj36kXPyUUBX0i5MkQzaObBiPoSTYSsqukbpAweaeM4/1N7Htj8DctQo7gjYvajsGs38PDu/MZOcINqX/7ln0kQ+Bs9MpmjKjT4Ic4ILrx0oru7TRAOGJaWSb0d/ZU2hd3DzoBvfjR/7hwFfymItDivYCarALvuEZEiirmCRpedfVPl2IjBYDlE7fvQkxc+OMRrHRiojDFryiyli/hR+bjqs+jUa2rv0y8t8chHhiXAgplGh3UzSBg4HEYaxA66zcqTpJZP7aODmuLe8cWykqX4V0vFnd/WbDaBWy68gOZw071R/hGuDan+ztzKjTX1uTn0tYOJPdLdm51B+cmkRNvKe+nUYB3Yf7vg9ZPZnBAM/10Se4arG3Vcp1K15SRrNLnkDkFYUc1ATTPq3cBJ7DwBfrFdXoJGjUjm6hRjr4ngbPgMN51vLq3tEgKJ8jBmqzJa7ly13SPpFrIJznjBZLw+YQpKWvpGlgh2vM40ETtTsT8YNmVDod967ajjxhjKVD0oXdCczssJOeuUDIpNq4XL/3Boex X-Microsoft-Antispam-Message-Info: 8ksIA0YbB7Op7AD6eNn0iVuHOeITp52lfY5uBL8tTiSW1neXLaHeKDRQibpaVXpRLpZbFQZ0hEr6XrdJVGM+kfbxdd2VQ/o/6QSnUTFOJ2GVf15h95LYSxKFJXsZZJz8GGEiWVr36LOzO4ADq9f2M+amFFDNxedr6ZedvdHInhakYmYkgEq5dN+9fogHTeXw X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 6:uRYExbcrJgOdWEd5jRaswFKLOW9ylw9K1tJ8HO4nIqg9rg+5q7yhHkTfqdwt5rHXU1PPeBQ71E1cd6HolvgY3WrScHfoXYYgprp4FGyBWlvMi11jyrhdFQIW32t+0q9gK0rUVsHzm4XR90gnmD+RMjW1QlJIwUu1FZ/53Pdg/0Kvf6RkBVRSv2qZQKvcGf3fXZEyMx52qKRHlkKUTlR9n4S5HoETAqVAgi5zQJie1L88SlcnbW0w8C5L/jUoh1qbq5HSCMPMHSLCTeHOVUXyy1kS+obcX3/W2lNcMFGJI3JEG+O3oLzPddwiYNuYQ1dk6f/M4dvtYjGT8dnWDi0q4JOgUKJw8vlpJ8ZzEVk5ujRruxvig7lkLSOhI4CnnI4Ew24+BCLpD1sVEDRDfquta7BKZ4EoXW7ws5amOWQCAj7jWem9SLdd2DQltDwnBXQbbQmV+dg1pKCYgYFu953Wlw==; 5:KJDT7IHaFF76yRoVkS87oj+ivGEhcY3u597eFBsmy4T9xsSh/RlFSiWnP2uaMh6wqTKhDTuGk/Tf96IA/OsAHGEtPUHDXDCQbw96XYns3gdNOy4QMp+sswFj/CxqFfHTkQT48yk0Z0j7Kp9DgjhnbmshraSX66W1Nghbnf+zEDw=; 24:h7SntMkGkJRAjvSXfeObk5ryXOs50aLlh2jGQO0nqqe9Uk5f7LfK479BANLsXwpqQgMctX3g3l1XtxKhmWjNkD+R5gSLGiAkTta1HGZuas0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 7:zxpLTspW1jt+vfZnaZnOfBSJeR40teeC1M6v+uKceXuk8WexyAn01nx6dLVZdF+N+AzZs0B4LF7yg4mDz1wxy4+MPYd5vQgafbNh3WHRjBZOvfL/t8wyFl5vrXjp12VP0U8s+dn0nxls3NtOK/BxeoCC2nQFOX1kXdzrcuH40iR2L/EUvCIR4rf6dnqIDj+cfk2/Wu1CeRbE4X6ke6PXp/dSouEf5iYtXLmlOdPTtN78qxeFjbWnBIAIluWxXBbR X-MS-Office365-Filtering-Correlation-Id: b66d6c9e-f533-40e4-ec03-08d5b9aa9ed6 X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 May 2018 14:54:39.9663 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b66d6c9e-f533-40e4-ec03-08d5b9aa9ed6 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4ee68585-03e1-4785-942a-df9c1871a234 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0202MB2782 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Because it looks neater. i2c_imx_dma_write and i2c_imx_write are always called with a write in msgs->flags, and i2c_imx_read with a read. Signed-off-by: Peter Rosin Reviewed-by: Uwe Kleine-König --- drivers/i2c/busses/i2c-imx.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index d7267dd9c7bf..bcb41fc75043 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c @@ -630,7 +630,7 @@ static int i2c_imx_dma_write(struct imx_i2c_struct *i2c_imx, * Write slave address. * The first byte must be transmitted by the CPU. */ - imx_i2c_write_reg(msgs->addr << 1, i2c_imx, IMX_I2C_I2DR); + imx_i2c_write_reg(i2c_8bit_addr_from_msg(msgs), i2c_imx, IMX_I2C_I2DR); reinit_completion(&i2c_imx->dma->cmd_complete); time_left = wait_for_completion_timeout( &i2c_imx->dma->cmd_complete, @@ -760,10 +760,10 @@ static int i2c_imx_write(struct imx_i2c_struct *i2c_imx, struct i2c_msg *msgs) int i, result; dev_dbg(&i2c_imx->adapter.dev, "<%s> write slave address: addr=0x%x\n", - __func__, msgs->addr << 1); + __func__, i2c_8bit_addr_from_msg(msgs)); /* write slave address */ - imx_i2c_write_reg(msgs->addr << 1, i2c_imx, IMX_I2C_I2DR); + imx_i2c_write_reg(i2c_8bit_addr_from_msg(msgs), i2c_imx, IMX_I2C_I2DR); result = i2c_imx_trx_complete(i2c_imx); if (result) return result; @@ -796,10 +796,10 @@ static int i2c_imx_read(struct imx_i2c_struct *i2c_imx, struct i2c_msg *msgs, bo dev_dbg(&i2c_imx->adapter.dev, "<%s> write slave address: addr=0x%x\n", - __func__, (msgs->addr << 1) | 0x01); + __func__, i2c_8bit_addr_from_msg(msgs)); /* write slave address */ - imx_i2c_write_reg((msgs->addr << 1) | 0x01, i2c_imx, IMX_I2C_I2DR); + imx_i2c_write_reg(i2c_8bit_addr_from_msg(msgs), i2c_imx, IMX_I2C_I2DR); result = i2c_imx_trx_complete(i2c_imx); if (result) return result; From patchwork Mon May 14 14:53:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Rosin X-Patchwork-Id: 913003 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=axentia.se Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=axentia.se header.i=@axentia.se header.b="KL0tzACs"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40l3hY3yMnz9s0q for ; Tue, 15 May 2018 00:57:33 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752449AbeENO5V (ORCPT ); Mon, 14 May 2018 10:57:21 -0400 Received: from mail-eopbgr20126.outbound.protection.outlook.com ([40.107.2.126]:6853 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754001AbeENOyp (ORCPT ); Mon, 14 May 2018 10:54:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axentia.se; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=VN1Up1sJxC6jG1szEcWnTC99e0f7tA+JX044Jzch0LA=; b=KL0tzACsmncoUdqM7R85fF/LCLs5OaktMRRfa8mfMoK9gpMGXfcOSd9SiqtAt0AcyColUHTBEAkvFjjvg/453D5ULDvBnpVfOp1gzi3UHflDzzwdCdM0a/WvlM8a8u009XXwq4UMcLL0aUGWPnqI08CVT2NDIIAwBRpS+vixZPg= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peda@axentia.se; Received: from orc.pedanet (85.226.244.23) by VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.755.16; Mon, 14 May 2018 14:54:42 +0000 From: Peter Rosin To: linux-kernel@vger.kernel.org Cc: Peter Rosin , linux-i2c@vger.kernel.org, Wolfram Sang Subject: [PATCH 13/21] i2c: kempld: make use of i2c_8bit_addr_from_msg Date: Mon, 14 May 2018 16:53:22 +0200 Message-Id: <20180514145330.4857-14-peda@axentia.se> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180514145330.4857-1-peda@axentia.se> References: <20180514145330.4857-1-peda@axentia.se> MIME-Version: 1.0 X-Originating-IP: [85.226.244.23] X-ClientProxiedBy: HE1PR08CA0043.eurprd08.prod.outlook.com (2603:10a6:7:2a::14) To VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(7021125)(5600026)(4534165)(7022125)(4603075)(4627221)(201702281549075)(7048125)(7024125)(7027125)(7028125)(7023125)(2017052603328)(7153060)(7193020); SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 3:fGVFztAA1yx0VdW5Q4ROT8LEtfjZspDpiNUvnFrpKC5q6NHphSdKtfR5TBft7c96Kg+r0pJfDmCpIrM97BE3JJd8OfGUJV91c8b7elHCTBwLw0NpaOA/UjxMYF3iY2vYOrMjB7uCxXya0fyll3/RLPAmjcckycWab4IvlDNoQSADTfRs57OjjqQjThrn2TCl+UG2lJ/yO3eXZOT/Xx5VoXca4DnFezTx64uBtTlHa/rsm/8A/FnF8grPRUJmNfDP; 25:QPgYOkepr4WSJzelrdPm2hjP6UPzyUFCVsBqKdt0PTh9puHDUCyseVw+fw8jJMdm3nhw3LRBqJpSPqjYhqToC+aynJTm7YQNGfxyXSaOQ8bG+v0J34U8I9udpTS19ursMf09HGtTv7vxqTD8F/oxqEsAtIraVOnTpCtMOmOxw9/wwvHlbuKcdsnGlg+FslgoMtu/bzh4IichaoQn0K/xUJ/vwN7r5Jcq/wqvqh+KIol4Lnq+T0dmfn2h+Ykcc46QJuv13qXheeFa9xOfojgJjZAW6BFM1LJgeymWtJFh3SsPgZlii9oRmqBFbfFNBzkDQnhAPPhQMcQqxdoyRhKJ/A==; 31:i6zuKNqWOdDOaBwZP57zUYxxshk0E0xW2n7OdEYuwkGp+Us1Y/u8fjW4V+Y9zWgTXS3OglFmnwn+w9ay6nmAJqJJU78luH6H+2oGcZxANpB4f9puHT9Bj7XOD+jMq/6MKdOYclS907mo1is6F5Zbvxq4t1mu9kkYDJPMoVPrRAmmNDCnlgmIuSkzvxYFYSDbLR3ylm9dTK8VqvLvgL442kIXtUP3wRE0lSUasH4f7qU= X-MS-TrafficTypeDiagnostic: VI1PR0202MB2782: X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(3231254)(944501410)(52105095)(10201501046)(149027)(150027)(6041310)(2016111802025)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(6072148)(6043046)(201708071742011); SRVR:VI1PR0202MB2782; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 4:PsQ2ZEAIlezYX+xEJ267xh79/K/3pXWeJMaCxvTlAJvyXkMw9bRMnPzRnomKCwIsfo6zPNsMmkTYv2TJR7WfHGAarAkzf4nE8EuRmM4njDTbO7phWxDZ8rt/YSINiYGrDUarh3ISBLNvxt7zcb8JrfZPSZR2j+SFkWKNfpADwm4eCfhzvItRRXNGi4X725LwBQrmuj4lZFOuF734UnaeN62W8lDu1QS8zekfcTL7y4niFDsz+hz1eB6K+4AweJ11mMwlSV7SSxm/JEttQMmo6Q== X-Forefront-PRVS: 067270ECAF X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(39380400002)(396003)(376002)(39840400004)(346002)(189003)(199004)(48376002)(6116002)(97736004)(68736007)(478600001)(4326008)(5660300001)(1076002)(6666003)(2906002)(53936002)(16586007)(3846002)(66066001)(6916009)(316002)(15760500003)(47776003)(50466002)(54906003)(6486002)(50226002)(186003)(16526019)(476003)(81166006)(25786009)(6512007)(11346002)(446003)(105586002)(7736002)(956004)(106356001)(2616005)(6506007)(36756003)(76176011)(386003)(2351001)(305945005)(486006)(52116002)(51416003)(26005)(8676002)(81156014)(74482002)(86362001)(2361001)(8936002)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0202MB2782; H:orc.pedanet; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: axentia.se does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 23:RAg4FYzKxdd9eujOvZ9t0nJbLqwFRSImUbpkUMNK6xwG9XFmr+JiW0uJWta2D9cbX4WRTz0V+OXjO6ek0Kxxz8wQF5beSc18wpBW+KYm5EfUy485oj6g6i07rNksPqu9J0uFeg6KLpW0z7W/WG5NjpZrhtqr9f4ZBG0P4ufonx916I3ey0ma501/pDwtQYD9+03mfPP4OpcoK5JA+w6QtRi77iFnb2SIMv8Jlye52erpNK8j6KQO1lqFRnzHcv/xb8BMfg4tTLq7FYItbRsiPBcxJwy4IF+GSbY0udOW8N2s0P7zhApAtqMRRWYQK7AvmsJDrolQz2cNQecjIbbLH3tyVu5J/0f6OX+lO50yLXzKvxP5RcK8cUm9DlZyqngrS/1G/nSrMfsXH4ke88enYHgFLuFj7xW19Dp183rI3Fjm79NExG9sahflzusrV4wR5PKzYGGs93oc3krF4fKNRonu23My2f5iToSe279dgk7tO4KRENwffRw5arFJ+YtCblkS7MOKcIBRrjLGA3FXpywXokXwouMMKPVxaqKZtnw5KwF0/NhaJD+w925lYc4lgxyfdZUJgSiuWfEx1gHHYAAWsTQTkHtwjRIUqkboW4+V+c2RJJ0Oh/RrNpMY+oLsR45u0/mDS7oxmh2u/gphiLe1/toFh4QCWVOvIXGIcFPY/RjSCe3acvq0N88QjujvzBQkfIWPYh4makkQaN+LeIFQFE+eRRUi48OF+fc6Mo245N41zwQP5CPKQOPr6yenAcc89M93ZQtSBMSD3MOO9Fqu1HiY+MdUW2Qhkbhid7wek2BZDwajNlLc5r3sWHUQC2enhkZuOv4xelIhiHT+P4UxtnlHM5Xce+9icsVsTLEyeaUTq7cQjLvnRjHBQuJPX3c2Wug2V+QMhSnAq+pP+qJOmU0dXw/AUlB90tDJlQjFt2I6f0jWZuW/7b9getsl+ueGA2/6Ltmr01Syu4Rx9xga/rQgo3hGhtb/CvKAu95/6ofeGOgnS65yuRDewnW1fgniELHdsHYmIxx9mOn95mDeNi+mSWK/hPgXoF3YfUNVrNDzU3HIVBDagOmaLrcWo5hGFPMIas/+ve1Hi7VXgd00nixFSS02lTFIsY+IUNbBvzg4zNfUCV0FzSh6Ddx/vmRh25E4kkDICb0CAazOWV2fvFTOWT04um5A3r7L2GoaF+msCLt7c5/ODdhXUE+v5WiIBUViTPhamCPAxHwqk0vp2A87+fnWDGhaiMRlfv8mQuENFZpeIb+varmO2CiUGnDIxHHYwhQVXJcZt/JLBYpqeHzF5vUfPp6pjk7EqX4sj9CHHK6JtTMKQzyyJB3T X-Microsoft-Antispam-Message-Info: rzy5jQI4Y+TTgsOnxgDu/4dSuUdJEujazSBFLpbOUEN3sHaef4/iz5U0S7RoG+CtPwxPcDJwNY1THVzLnG331qAuxgz4oCzavKGUCUZ+MBabpH1Sk8t1theNhl0j0i4bruj4mJT8JHcmPy7x/9rhMZuUnvo6ytYriQkjGFnXdSRq16/GvFw9tHQgDCrru/KT X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 6:B9NAUGp/bVfquaA7o77Fy8wdwbOjZUd+fCAtjjxY65bakvkdDH15kSBeGvqBVlYjI+kFWLG101BrOi2G5yVdyS5aZPCW2hBtvU9F6aWbnLuEXC41QQ0k9wkfDgZHGGLvC88yv/8ZB30QtgKOha6RT+PVix1j1tr9N4AWFzEtX+qkjQVzo50pRinN1oP1Y0KBGT/96JOjjYfMwoT90dM2Sgb9CURszCT+nksPFhqrka1q9xaY5JhpMvEXfYdoLqT0+bu6cUyWTvYSE5ZoRAPXsuY4MSz+7iNQ7H077tiboaSYUNqSakOltV3XbZZad0TUsWjT2BFD6+31MJMHWCEwVng7yPqChZ8iz4Dp1mf0Ds/Umk26oo6edmMr1G3VcpyyHYbmXhagHb5pc1HsYQL51Cq2OtBB9hx1UxcIm/h0w1E2EcEKAgvV8LU30pklwn6i1eIv5jUGQLiKUaL7QLMBZg==; 5:AwGR1y0c8MjsZbswSynYeT4dibjZMNnT81rjgDE2k4N2ewulqGVKS+potfk4lKc5336QEnEnmzi4YJ+zm1jVgceaQNg8LT+gMrZDwgJQVR67mfmD0Gfn7dH39B4yKvzgj5Oi8tJnNtzDkJ0zELi6LDwYIiXNsjt6ll5KQzaUX7U=; 24:KXiCAYHMjKG7b5q3PqZE063kHwZlTqX3CnOqO+xo+HVU/v1ezbPfCtZoBzlLnIDCgvr4w6yGKXMVd32b2Q6un+lBnE0BAvI90IlWLjvp/3g= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 7:cwiiUgCZIHajvhC59Go0OWJLPtCWY4cdaaemSkTMKED5hlKoJAoZldmjJrHmTDA1RM4A/qyUnJs36fNkBP5g24SN1eMWncACvpY2lG4Li+uh0ziyIUJlUTV+R6vv24uD0i0rHwVR3Su1Pckd8dPFJlkk6RBnyRurIB4J4p6F3GCaTg4MzT20LBMNyjGtI7Fa6Ul3aMsDRxPf8T3rk3KDU6oWVQ0edOutMdRwffwJ4KzUi0MMq8y6MiR3dXobvuW2 X-MS-Office365-Filtering-Correlation-Id: 061cac5b-c39a-4993-892a-08d5b9aaa099 X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 May 2018 14:54:42.9038 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 061cac5b-c39a-4993-892a-08d5b9aaa099 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4ee68585-03e1-4785-942a-df9c1871a234 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0202MB2782 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Because it looks neater. Signed-off-by: Peter Rosin --- drivers/i2c/busses/i2c-kempld.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/i2c/busses/i2c-kempld.c b/drivers/i2c/busses/i2c-kempld.c index e879190b5d1d..1c874aaa0447 100644 --- a/drivers/i2c/busses/i2c-kempld.c +++ b/drivers/i2c/busses/i2c-kempld.c @@ -124,15 +124,14 @@ static int kempld_i2c_process(struct kempld_i2c_data *i2c) /* 10 bit address? */ if (i2c->msg->flags & I2C_M_TEN) { addr = 0xf0 | ((i2c->msg->addr >> 7) & 0x6); + /* Set read bit if necessary */ + addr |= (i2c->msg->flags & I2C_M_RD) ? 1 : 0; i2c->state = STATE_ADDR10; } else { - addr = (i2c->msg->addr << 1); + addr = i2c_8bit_addr_from_msg(i2c->msg); i2c->state = STATE_START; } - /* Set read bit if necessary */ - addr |= (i2c->msg->flags & I2C_M_RD) ? 1 : 0; - kempld_write8(pld, KEMPLD_I2C_DATA, addr); kempld_write8(pld, KEMPLD_I2C_CMD, I2C_CMD_START); From patchwork Mon May 14 14:53:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Rosin X-Patchwork-Id: 913000 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=axentia.se Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=axentia.se header.i=@axentia.se header.b="eY4l1gXE"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40l3h65LZQz9s0q for ; Tue, 15 May 2018 00:57:10 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754064AbeENOyx (ORCPT ); Mon, 14 May 2018 10:54:53 -0400 Received: from mail-eopbgr20126.outbound.protection.outlook.com ([40.107.2.126]:6853 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754049AbeENOyr (ORCPT ); Mon, 14 May 2018 10:54:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axentia.se; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=b6TV5EEa3oG615Sy92UxvUn20InxPJyA5FjBaurdxng=; b=eY4l1gXEmvHgskoNzIrwEPTbvfrXNnvwe7hbxpaXCqvZwtaDwotJ5j/+b3RX7QZ5r2rZMIU/3zy7gPAWUPG0M1F6XLaNT+gwctK1d9wrwt12TAjwVefmPJFx8nC5eI7rUdrcB5N3e9JT3Ed7K5NeE8NBylD3yQvfmMr6QgA7b9w= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peda@axentia.se; Received: from orc.pedanet (85.226.244.23) by VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.755.16; Mon, 14 May 2018 14:54:45 +0000 From: Peter Rosin To: linux-kernel@vger.kernel.org Cc: Peter Rosin , linux-i2c@vger.kernel.org, Wolfram Sang Subject: [PATCH 14/21] i2c: mxs: make use of i2c_8bit_addr_from_msg Date: Mon, 14 May 2018 16:53:23 +0200 Message-Id: <20180514145330.4857-15-peda@axentia.se> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180514145330.4857-1-peda@axentia.se> References: <20180514145330.4857-1-peda@axentia.se> MIME-Version: 1.0 X-Originating-IP: [85.226.244.23] X-ClientProxiedBy: HE1PR08CA0043.eurprd08.prod.outlook.com (2603:10a6:7:2a::14) To VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(7021125)(5600026)(4534165)(7022125)(4603075)(4627221)(201702281549075)(7048125)(7024125)(7027125)(7028125)(7023125)(2017052603328)(7153060)(7193020); SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 3:RRP/J/viKecvDLpeEEe6OmNu8CT7/hnB1QiS+GVnbVinCGv+zs2I0Rt2Dq40vGNto9fQSe0cwgYbOUIF7SxKBY7L58bSTcFN/77IXHXV/tpZdZAm/mjr1PIh3hLD+l6bEopd+F1JSnGZCBPiDJJdvC9RavtjSfBNlx/Z2QjlVqDr1OznPPkSb+3GXT0IOYqjstKIZ+GLZLbehnUTZ6ccm7hrFwv9oZbWwiohpSzDBV4mdhgzjZFV7/O6pjkClhqv; 25:L5DlLpCrHgWRJ7PzTMrMmiwyJ42pkwomAWzwAFubNdRQl5PfYqVFTze/2jOgkK+prz0DONYAvc85L5+v9u9wAOrjmR/M1gAjZ//c+dXlhtEmbGE6uoavIrgN887k7I2vH/XYmF12SVAf02nMMfsWa+3dJre3uaZO6ZOMhqd1mz/jlB//gQgMR31G0S7dLEnuxQZigxgV5Pt7yGUXVbupxhfU+xW7mO9ajbytXpEJtJd3sUW9aJ6sA46CjSB8Q0IWfoi/zt1ZL2cIUBMKmUyqx+UbZGLZ6m/yfaFhU6ukpAceMNcSwQb5BtDstnhclngq9bniYwlRKZDOZjep9G9ISg==; 31:IPBwcodiCjwRYvnZGlhezMf0XuhkiDITq+SJO6VvJoZpkgBxXTl0hQeARo0ZSDpJi/WRjQvUhmMBHzAR+aAiMrpnw9MVzg16umXaCiKJncG41WQ14J7hqDgBdW3ipOH7B6jpRrObZoE9lHLPnmkfTT1TRhvaUfviBBPU4c8Dkfhg+OA2FF7sWL6qSKRaPXwwRkL9KTND/BZB1w1XfTMGnYd3+sUiYRgVSn/KHgCzy/0= X-MS-TrafficTypeDiagnostic: VI1PR0202MB2782: X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(3231254)(944501410)(52105095)(10201501046)(149027)(150027)(6041310)(2016111802025)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(6072148)(6043046)(201708071742011); SRVR:VI1PR0202MB2782; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 4:qGS3XNzm5FeolNzJsHOiLM0fk3G0xT/i0oKhAWz5S8gcZyUpFPB85sMS5mghRtFVb4DNpNL3qgCdK5iYpoO5/MmvFijqmk90pV+iRm/R+sj6M2X06RdzVEou1R+bKi76thmhtQmSgtW2tSWbFiLLz2Kp4OIdalQ7PC77giHeKUiO5pPtYNcdVSPbmixcONsifB5Du1NxMB+qoSHQFZJduAUPItZElHsgW5bxfuGgnWnOwokuYnxoIV2u5TT3cHbptaBiXEzZ7CYKMYRhDPn6Iw== X-Forefront-PRVS: 067270ECAF X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(39380400002)(396003)(376002)(39840400004)(346002)(189003)(199004)(48376002)(6116002)(97736004)(68736007)(478600001)(4326008)(5660300001)(1076002)(6666003)(2906002)(53936002)(16586007)(3846002)(66066001)(6916009)(316002)(15760500003)(47776003)(50466002)(54906003)(6486002)(50226002)(186003)(16526019)(476003)(81166006)(25786009)(6512007)(11346002)(446003)(105586002)(7736002)(956004)(106356001)(2616005)(6506007)(36756003)(76176011)(386003)(2351001)(305945005)(486006)(52116002)(51416003)(26005)(8676002)(81156014)(74482002)(86362001)(2361001)(8936002)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0202MB2782; H:orc.pedanet; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: axentia.se does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 23:GzWhJXiQ6h43MpO0h6PWYLebc+qJ0UzMO5ayzZXiHCxOf3medN16xzmCejOF/YjraO6GbaTQjnX7x8to2dQni1fyk+KhLq1mWppH9/1mHB1KBjHn6ROVOrVaopnUqtOczpdb+GVMH3OBwnosqhA45O6m+b3VsmrK1+CDPJue0vs33ceQ6xZ2lGU8pfrU7nThVBz+e4eKLbRfuG/sTja95Po/PKvKglBXLawfk4+nEghYXQqjYS5EotkS7R+oQ2NrwWvINdyGlk6jcTqQR3aAzLIiskXZuAoitbP8UltcAeziRXU5RiGffSM67KimbE+9S9xXriAWmPodKGEmcbiT2eBNTChuD5wzdxILmRmMCjrGFizC8oaeBWxqF6MPuAgzlKxkhTmJ0rGQ1MZ/MNSqkYACWMEwzfJ8/VxhZhEna0WSCb+J4/wKyyP04m+z62YSVfDnUJqSPVISBPWOyMCBXVQlW9HD71OEOnxl4epVjt3/ewW1xPBEmXJitdTwvOZd4tvFJkpyQE83HNXiLB1ZcVuhYY3hA8APTsODuvFqWXMKnPhmLXuxl1nswkTOBNSQ6mgWIv7Qpz6RKh1Hex/sicP7+LPvpIhRS4ApUo3X7M8/nPcVBuaK5VgbG3CpCQoR8Z00ebFBFVaRP5Mwm4aD/Ae+NUmTUgTO+E2gX7afxxHAPyjPYDfP6aYgbD2zQu/u/YNn1dcsW8ctUINGAacQOtj+VBO6WH9TKZXMKf55wuyVVq4VI3LLsy+RWJp3Lp8Go7u7K8lrFjxZttGf0TpUB2VB3k7rjT5zDsG/Gy5us2Nx9rLBlwhSUpz9UPcW/PVsVgQmLYYZULzpxotS64Y/aO3+eDQT8E3k0cpw1IUpj2L5pglKcC4QZbQJKa1ofhPkvWVnjL6lOtnyv7ZVuAf1Yn2Up+b+4T3vydSLLFUSSepTMIzkfXiEX/pJ12lvRhHU7mxB2LmpibBtGUxOyVUF8TtgBx3dzCvS+03zQZ0cC72s8M5pqVDlyUmddX/sdWLTaVVPDFesVshdBcWmGRSbDYsVK5uCRfXAPt8pQ5PDFFEVbGcaSPcLXrSxoNKVWxP9TfcsK/J3oksdSw+3godZsNzsQ62OKol2bafw4yeGKQgLgxm8JlksBJZUMty5a1nTEJqx1nLpplg3HJ8WCJUcbKYu/+3HnVy4mf9M+IUxRhM8sUuY77oDO982OuTe5dB6b0Wg7C7USy6iERxzuDN5ijnU7dZKmJMLjCnrrikJOuz8qfLDPkOAUEL5z21ZxLoe9rOafZLX3Y4nlMPuL64Lt9K1KRoxb0DNh7uWHmbW3zoqB28QbjgktYiC1nXLAQFB X-Microsoft-Antispam-Message-Info: vytks/XiJs9R/KYuTRMYWyytgCpWdHPvBtI3mb53KI+MjQPykiQfND337nfdmQyUVcPoUL6eZDvj/VgK0WztaOc4bnPHsavYqKNYNG0hZVIGkA+NYL6qeX6adFyxKIINOdl7GKHBwav2LnPbMHrBFLG2JhJPUgoEzwviOkl/XcQAV6rXJ6ug4n539op7hc/T X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 6:UGzStpVveXHnGeHw21B8bHXtmU6+gTN/h+xsKfuxXyn/JijlERGc7KXA/ke03nCcqA9g0AYBoNUdrosjZ6dNHUMlRkWEoe7dVaWfpyof6ghWGASVo+P2jv672PGUUPkZe5ZmfLFtI1xcUBmoEBua4JW4KOJl6MrW3XgLkRcV+ePobQALKvD9mT0bHxlapCRYulcb+P2dd5ILttxk/VXM1eem3WJg25Ek7uM8yeooFSp212x6L2zQv7sybaIASE0y7VOr3vMiw9gRpBW6RvZE9F3zBvje0pGsG/RVsZukpv3KM/fxTuxahhbMvF2sVJshPT5lIAhszKMn+yEAeii6Y7VDe2Nk4N9aKes5UAhS+9CStd44KpB4uU2qDFq1iVxxWxiNsnfC78UK1pc35YkOT1LHKCuwCA3/u3LfYB4uCxFAI77nh/2/pgXhlnItf29GAWjgpWBugVBf+OoArojHng==; 5:m1uERiJqWmb/oJnYJnK/qpyGTmdDXaFQK+cY9OsHiEWb7NDn9eeM+uVzpz30TJpPsmH6dUvZ2WfEBbQtoo4JhvsGeg7ioNtehsBVF20AyD153b+tRdLCNUj3zWg3huIU7TBJkD2Oz3FtO3DywUQRiW/IOKOozSxEu2jrdBmT9vk=; 24:6gxp1sCSomhMsNnNlTKAudwvBu3FLMoB9zMg6CUKoccWjMNgDJ5SdftgwGCcO5PCq4Ku3F70lTsH9ICQyb913X1/1HtwM3yHtE49jTHuVhA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 7:VE2wBqXq225dR6DxpQb1Y6zvV5QYnrE6ikMYVcPnGAmkLkbBZW0WMJG1no2/F9pjE+pNsemUxok5+eJnC5j2vQwYFDRsP6rxfOayPv9yseU5H5pahMA40lisOxsNH1DukZBDa3fTFho4qgGEj5RKvieS9GkbjcqzEflsnZU0TCfFI4J8iJ0vmGTYps7yeAYcKE9p62ed2ObeN4GrX8mN3MnPRO6vdIiMBB5fEhwppPcwxbdYAgxpcVnl/EV3y5WS X-MS-Office365-Filtering-Correlation-Id: 8a1c5a41-2781-48a2-1375-08d5b9aaa249 X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 May 2018 14:54:45.7320 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8a1c5a41-2781-48a2-1375-08d5b9aaa249 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4ee68585-03e1-4785-942a-df9c1871a234 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0202MB2782 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Because it looks neater. Signed-off-by: Peter Rosin --- drivers/i2c/busses/i2c-mxs.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/i2c/busses/i2c-mxs.c b/drivers/i2c/busses/i2c-mxs.c index e617bd600794..f62ae3d42232 100644 --- a/drivers/i2c/busses/i2c-mxs.c +++ b/drivers/i2c/busses/i2c-mxs.c @@ -180,9 +180,10 @@ static int mxs_i2c_dma_setup_xfer(struct i2c_adapter *adap, struct dma_async_tx_descriptor *desc; struct mxs_i2c_dev *i2c = i2c_get_adapdata(adap); + i2c->addr_data = i2c_8bit_addr_from_msg(msg); + if (msg->flags & I2C_M_RD) { i2c->dma_read = true; - i2c->addr_data = (msg->addr << 1) | I2C_SMBUS_READ; /* * SELECT command. @@ -240,7 +241,6 @@ static int mxs_i2c_dma_setup_xfer(struct i2c_adapter *adap, } } else { i2c->dma_read = false; - i2c->addr_data = (msg->addr << 1) | I2C_SMBUS_WRITE; /* * WRITE command. @@ -371,7 +371,7 @@ static int mxs_i2c_pio_setup_xfer(struct i2c_adapter *adap, struct i2c_msg *msg, uint32_t flags) { struct mxs_i2c_dev *i2c = i2c_get_adapdata(adap); - uint32_t addr_data = msg->addr << 1; + uint32_t addr_data = i2c_8bit_addr_from_msg(msg); uint32_t data = 0; int i, ret, xlen = 0, xmit = 0; uint32_t start; @@ -411,8 +411,6 @@ static int mxs_i2c_pio_setup_xfer(struct i2c_adapter *adap, */ BUG_ON(msg->len > 4); - addr_data |= I2C_SMBUS_READ; - /* SELECT command. */ mxs_i2c_pio_trigger_write_cmd(i2c, MXS_CMD_I2C_SELECT, addr_data); @@ -450,7 +448,6 @@ static int mxs_i2c_pio_setup_xfer(struct i2c_adapter *adap, * fast enough. It is possible to transfer arbitrary amount * of data using PIO write. */ - addr_data |= I2C_SMBUS_WRITE; /* * The LSB of data buffer is the first byte blasted across From patchwork Mon May 14 14:53:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Rosin X-Patchwork-Id: 912992 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=axentia.se Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=axentia.se header.i=@axentia.se header.b="v22Js9dr"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40l3dY3Bvwz9s15 for ; Tue, 15 May 2018 00:54:57 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754049AbeENOyy (ORCPT ); Mon, 14 May 2018 10:54:54 -0400 Received: from mail-eopbgr20117.outbound.protection.outlook.com ([40.107.2.117]:36375 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751498AbeENOyv (ORCPT ); Mon, 14 May 2018 10:54:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axentia.se; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=/ruR33ALw6fqw4McQG6kh39D3SdwJlgoBjiHdF8XaQA=; b=v22Js9drLmBkw7VzBUaW+hEcZHfB44+Y3hyzjCtBX+jolT8p4ClFR0djsrbk1XnVvdowO541O2i0qyIZGXjeWBdU+jYPCxh36Hze2eQXdhetRKpvNPx6SHSnAvHgNvRBEcSno/NryBF5gdvATQ2p12/GTsGnPKQpQhqtH5CPv5s= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peda@axentia.se; Received: from orc.pedanet (85.226.244.23) by VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.755.16; Mon, 14 May 2018 14:54:48 +0000 From: Peter Rosin To: linux-kernel@vger.kernel.org Cc: Peter Rosin , Peter Korsgaard , linux-i2c@vger.kernel.org, Wolfram Sang Subject: [PATCH 15/21] i2c: ocores: make use of i2c_8bit_addr_from_msg Date: Mon, 14 May 2018 16:53:24 +0200 Message-Id: <20180514145330.4857-16-peda@axentia.se> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180514145330.4857-1-peda@axentia.se> References: <20180514145330.4857-1-peda@axentia.se> MIME-Version: 1.0 X-Originating-IP: [85.226.244.23] X-ClientProxiedBy: HE1PR08CA0043.eurprd08.prod.outlook.com (2603:10a6:7:2a::14) To VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(7021125)(5600026)(4534165)(7022125)(4603075)(4627221)(201702281549075)(7048125)(7024125)(7027125)(7028125)(7023125)(2017052603328)(7153060)(7193020); SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 3:g0m6GuOLijH68R7/c7v+ImLRxj7pUaWSCltCBN26bXzmlgiTmQk9ECRN3h+OWn3ypfSnXKBsJX0OBoHk9vSYx3voJgXoM0eWFQMhbsP9Q+xTcLR/y3w4dA+Qhc4wKq7AMWquZ0fOr7EtgJ8VnI8UBJZ1wf5OCAckjP0hMvmU4iPRTsqtfsUpfGNrrkss66/N/ORfvp12L/awGcsxZYcgUCjRvK1Tsa1/CPf/X+ZTHuj1ZJmflAqKae2n8FbWLxuH; 25:R0OnZnOjQ5MwfvKbM/CVXh5i9cIX159PAHWMxWWRLWRw8m5laWwzJk5ww6iyGhiWBF2AenRNW46k1XPiftlL+rD/XRmVE4xDd8oTPjo7inPP1ZsCc2DfhOZXoVbIYjizPlHcGPlaXK1yx5d857J9dVHERgithM3HAG25Ah+D+9gD2XosAm8sRe5c292dHCbVGEQa3/YWSQNzdQLAjF8Fk5zpzlzwTm8PBYVqafUS/t1Mr5o8kmRffIiXkACNIV+cjj6bQ2gjwo0Qh0oA1aPC4N4J7Am8FC11+f3gTsnMoCUIXnujkoamj6Kjxvu77cRClInBF7KQoMyTn0Gf5/HRvg==; 31:H8TtHWNrF0KqjzEfY1uyt+xahPIjiFly/7Zsih1/20ZebE2zw8bpkF8FVrzT0lBqUCbdhSxIhSQNdHhLA0AJ6l6c2QU91UjOP2H+pWu7/FHSB9+sqwevx2MLmupsNOxwaqCMMiwkjvAnfEEMFpyhvKFgwHAvdNecXkpNBJp2H02T8cPc/T7C/vq4rXttlCmhXG0gbpsEAjl9aYTQtogtYplNq7xfuIskqV5vGls/LrU= X-MS-TrafficTypeDiagnostic: VI1PR0202MB2782: X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(3231254)(944501410)(52105095)(10201501046)(149027)(150027)(6041310)(2016111802025)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(6072148)(6043046)(201708071742011); SRVR:VI1PR0202MB2782; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 4:URWvMe6sktb1lFj6hLHUUZv4/jYbrBUmZ4qTU482SYN1yB37Kd2JvhUyLOEH4uODJRhBqTqWkOclspbwmWwv+gXxDePbmwPBrClGVQSo4t5FZMQ7n4VAWGA9DfH2ULVQaJ9Lqeu5N7pDW/4U7hRkF2/hNPBPktAmMhzReWTJuGtQby83NvAPJxrTcZgIHmqsIIcH9wubS6vamJq23xTgW2KZimvbXGFbM3zjtViZgdQ1SDvahEl07Kd6iuHQECaFWFD5oMykJUfUzLLh0v6UMw== X-Forefront-PRVS: 067270ECAF X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(39380400002)(396003)(376002)(39840400004)(346002)(189003)(199004)(48376002)(6116002)(97736004)(68736007)(478600001)(4326008)(5660300001)(1076002)(6666003)(2906002)(53936002)(16586007)(3846002)(66066001)(6916009)(316002)(15760500003)(47776003)(50466002)(54906003)(6486002)(50226002)(186003)(16526019)(476003)(81166006)(25786009)(6512007)(11346002)(446003)(105586002)(7736002)(956004)(106356001)(2616005)(6506007)(36756003)(76176011)(386003)(2351001)(305945005)(486006)(52116002)(51416003)(26005)(8676002)(81156014)(74482002)(86362001)(2361001)(8936002)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0202MB2782; H:orc.pedanet; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: axentia.se does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 23:f75m/JdmIQub/FxetTK9HQKT01cur8YVgZPCLLNkRMGIJTTlcC7rWT4KS4MVG1toSfqBvrjblpT432j7TnA7ow9EOVwm6GQPMtaFFvp0+LKh0fbjEdPpM5b8J1ygAR9+iCTkwHJqBKM3yYdJyvNZvv0S1ykmrprmg2D03GqQ0TFkEzjU7s3kAdGQhsTCFAVrf+xBB7vwOHa9qy7/jL8z7OyLYVDTypFfCNU71cqkMTirNP/eX/Wo1Q79rW/FUzQoFEJXMAPAOARu9bYEkp9MUh9/6zBkJkzND/6y+qhuwJbCoEW7hwJUYgmNYgnOQ4G5CoNXpwoi9ABF0BxQKgBBcYtT51k7LaGVBXzr7C8fia3X2L9ZAzEC2jYn6hzXp+DfCfqw+nLjUtitPH8lrplImctIoiYbeXwvT0f7TknFoTR9mCqIKlLsSGuHYioyVVT0ZgaJU+bRDJxnKZuPOZnvdt60RUBPwLETmESW7PTnghlkO9byOZipvyaHhbx0c3Hu380BdQbSQFpXuq3wuNBEXav/Zzc9TTrrAH8MI3Vnx+K4skLZWem8ptP5DHpmZRUh2U+GI+Y35teCDUfVwbM+sXGVL4BCkUSrANmyGKkDIb9xSgPLnN5BLIzdg6JFMd3sLYIh71oB+hrNTI/gAZHdz1DKJ2yQFQ0jfQgqfMeVjLk6QkVPPEXLQSjOw5iJirWiJvt5Z8JilDtRCGI5x+FhK7BSF/91cofb1vQ21UQA5BaF3JSyuPW6lfqDuCEVGTelH92LpIPM+YpyAGzzkVaofrA7SEeEs4F9N+MbS+FZUjrrkyWNFH4Juo6GlUU8WUBRJ5BtklQPJ9nWf3lafQoKiQVer26SXaPHHn4Y85pFuXiuPAEaqQNxWadYZ2+RSAXqYURMrySYHcG04de/7uMqZlFNS8FIabg6tRV5hdekwENyZ+d6dxIlOert1VvSFyzWfcb0j4rK9PyGkTttzpEUMxOooFhQo0ZbzWtvpg141JPOKLGirBGHRjEypoCgTpkZv6clnaWPVBk7knBFr38TXJ13f5zYNaRQ9WqBJ5jWr8ZQP8ofUA1ToMQNj/A5rd/juXLspK16QnTzja1qNMvegM90xyYdXCJIy5EvbtHO4Syi/zC1OHDFenoPE9YC5sveU3oTy447xEFSfHb59VpCF6tIHnWVcgWSAkthJBK6quCV2tOfpu/ZJcxfJeGywTVNP5/cQh5DsTuSjKqjZfN07LT5/C7nV1Zj5paDkOOSNWdbbGo4oU6kgEfx/kq45xuwYnBH2k8RkVxrHGTvNR1cQA49fwg9alkDDy+JeMEzrZ1EEU0IuYdvgvSyQWVYhROZ X-Microsoft-Antispam-Message-Info: KsIcKpu7w91ovHst3e0vlpwEUNooXBS9KN0opk3D5+2jli2wSrsCp9WrZ8IKKelHajVTKKXL5pfPZz5Fk0hszpui/XpTrlgOrQvK0pDVchXx7aIkTow37TUJPnIQqmnqGFdG0iC/hpDv8woLwetwYgtlDBSOc0LmRA8btXzL/BlgXSNdPjGWa60SUKkBzcg3 X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 6:xDT5N4sf4Svt8J/XRaFnnDj+NcoOXABCVKavOz4ZYhlkD4wCI6wWJzWaVErJTdNWTruBdi4ePA8JVYR8nqz9Ewh3FpST5lt6wdQ0KdzxyF7vVqfjXdl2AEzjGU+ugV5foYWgQBulF+qq/mo6J38n+y0e7ER94x+urH7THinbB8yvET6m4xb3qVEWm8wV/Sk84+871ICwEsoa2qxCMbW+diTqumBezXx28IYU3jakl5yUuQxvqJKCNpCR4x54lrj1SCuYltKSvM59gSEILWIfaFHrGtog34W/Lhf0IwBFsUiNN6221sOSqbQSreJK5hdOXYMAeZSh3LvAe8OVNKGwWUmR/t9Jig3WMUbj8sMjr8VV3TkbejyABGfOZqao3Ewt9NyzVUGcjEgxo0qLNgY0GYjcYTL2/A3fcqXniKj8psWltmVO1iDhxh2c86/e7yMNSGu+svMfOLvSnYHsLrFfQw==; 5:t8UaZaq2fHVJtuikb/BM7wUirzQfyTyt7aX6F59q6gwH0h5P9Qj6cTjLqYiLDmTGcUezapnyTRPXePjXrCWTQR3WNusCFj0cCp94N7cPTeSXGFtmK/T0PPcxJjrXU6iX1oLUlVmYd+KXmiIK9Ml6Cgtiu8UwxxsB5ggGkI78jV0=; 24:0rFrrsSjMRLDwZ9S7/GR5oJsnM204QVat49UurALjostALjor58ST4M768GZ6jM6WShXFdm1gpohhGok3A9QCaEtglQ0veG7cfsDd0r1OPg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 7:9A+rUa1phDxeJLcsCAAzAJSNJJhOI1Zw9P+ig0uE2wyL34hTQzHYAp4v/f9Vhh1XQx8IZGYfRi/CQ+2bablv0z2sPTd43GF2DdMwdP43aP3gZeotkJnJ6X6BGARV4B7QzRmxFwnWSYjbJf/4U8Jh+f8glj67Bnl9iNx7+ZF/XJFL7FCHydrsGLNsSX+6KAWCT5RVdukz38OTLAKcWXjakecxa0PAarIMcjc7DScJJMarD3S6jBHaaqU/5BVDHhp0 X-MS-Office365-Filtering-Correlation-Id: 2389fdfa-7204-4556-ed43-08d5b9aaa3e7 X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 May 2018 14:54:48.4039 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2389fdfa-7204-4556-ed43-08d5b9aaa3e7 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4ee68585-03e1-4785-942a-df9c1871a234 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0202MB2782 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Because it looks neater. Signed-off-by: Peter Rosin --- drivers/i2c/busses/i2c-ocores.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c index 8c42ca7107b2..a540916689b2 100644 --- a/drivers/i2c/busses/i2c-ocores.c +++ b/drivers/i2c/busses/i2c-ocores.c @@ -222,10 +222,7 @@ static int ocores_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num) i2c->nmsgs = num; i2c->state = STATE_START; - oc_setreg(i2c, OCI2C_DATA, - (i2c->msg->addr << 1) | - ((i2c->msg->flags & I2C_M_RD) ? 1:0)); - + oc_setreg(i2c, OCI2C_DATA, i2c_8bit_addr_from_msg(i2c->msg)); oc_setreg(i2c, OCI2C_CMD, OCI2C_CMD_START); if (wait_event_timeout(i2c->wait, (i2c->state == STATE_ERROR) || From patchwork Mon May 14 14:53:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Rosin X-Patchwork-Id: 912999 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=axentia.se Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=axentia.se header.i=@axentia.se header.b="Z+50ISQI"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40l3gz3KWyz9s0q for ; Tue, 15 May 2018 00:57:03 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752017AbeENO4f (ORCPT ); Mon, 14 May 2018 10:56:35 -0400 Received: from mail-eopbgr20094.outbound.protection.outlook.com ([40.107.2.94]:21184 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754070AbeENOyy (ORCPT ); Mon, 14 May 2018 10:54:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axentia.se; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=oLGNxc1pAviA3zntLnms1Bn/Pw2Wb+Lq1Dme/QF8p9E=; b=Z+50ISQIZBd8ikIELdu7QLR4W9JpgXK2D45etoDQFIH1/FVC1ZyPkVEn04qgrLv7rjzQkqhbWxGUjocgZmYz+19H+OIH8648ydHaM3RzW+jaglUXWuT4acX9kYsjYbMrsQsOPQ3SoGJtkXOnt0G1UwiKd5A4icsZySWLeJHXvQs= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peda@axentia.se; Received: from orc.pedanet (85.226.244.23) by VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.755.16; Mon, 14 May 2018 14:54:51 +0000 From: Peter Rosin To: linux-kernel@vger.kernel.org Cc: Peter Rosin , linuxppc-dev@lists.ozlabs.org, linux-i2c@vger.kernel.org, Wolfram Sang Subject: [PATCH 16/21] i2c: pasemi: make use of i2c_8bit_addr_from_msg Date: Mon, 14 May 2018 16:53:25 +0200 Message-Id: <20180514145330.4857-17-peda@axentia.se> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180514145330.4857-1-peda@axentia.se> References: <20180514145330.4857-1-peda@axentia.se> MIME-Version: 1.0 X-Originating-IP: [85.226.244.23] X-ClientProxiedBy: HE1PR08CA0043.eurprd08.prod.outlook.com (2603:10a6:7:2a::14) To VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(7021125)(5600026)(4534165)(7022125)(4603075)(4627221)(201702281549075)(7048125)(7024125)(7027125)(7028125)(7023125)(2017052603328)(7153060)(7193020); SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 3:Fm7VfqmdS6jZZW0bHu6yxPAoUI2Al2i7oRbr+et5B2DMUfawLBp1NV7O0A5A5VEp0mlB3fHwQhwKphIHz0xEDAUIa6B0g06pXeafSBLAXP2j74QHWTsIqg+yYYae0VkvK93dXeApMpsLnlJeOb9176TL5qhnOo5Jsun+qESxfbupLKJhBExHOIJduMJJMtNCvremKrd3RvOdcOqtGU/LSPkbMt1o3ZygmpIUEH0y2Wcn8WALWXJ+xcBVaT+1btQd; 25:I83ZHYNsO/XKDfbeXcj9zgZy66HqyLnIL111w9nRQxgzESXHEm9eCbqQFx2jqpRNN3uNU4JJAuu2Rlhtxb643+mU5HRgOqPrFoHguk+n2D7nXvYNnGWpBPg28z8t303+oqU1lWfjOjL4sKiEdmiXpQObbLrBl8iGq1/MkxfeJn3N3G0dpBTT3JGQv9jwRYOB3R8cvSLcpwuTshrCO0PzKNNS8qwQ/lbsjB1R6FNfR+LBKkT7yW/PFD35NYyk3IoO9uBqxMqr6DP4i+qrA2PVBR0Z7gHT3CyJLVLVZjwsCXERQdugS9dQOk3FQIqCZUwOy/u90XopSQMZSqVKtJK2fw==; 31:o2Y5GCEsS+oNjY98pkC7EOQCWJcHx5NkV7V8Iio51JVFWA+kMetYxsWDM8lByMr9NBqaAPHDPlN0sSOhn/N2YKLBBaoj0M54Fm8gMymvHoDaBQW3i+/RvgofEhhSOWXy8tuXY+I9nmp7nEW7nalJGJ2qlcd+5HO7qWhnmdx25UKBDgNxl6suIeE3GDaEWxphn0NEAm4NqkpNHAu1bdj0IrbZJfcOl/9SV5Ta+s+iFXk= X-MS-TrafficTypeDiagnostic: VI1PR0202MB2782: X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(3231254)(944501410)(52105095)(10201501046)(149027)(150027)(6041310)(2016111802025)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(6072148)(6043046)(201708071742011); SRVR:VI1PR0202MB2782; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 4:LVOl4fl+YZNGKAbg0l1hKqJeIT2rC4kvj786Kez7f3zN2i63g0qgNkE5Ubu0Fr7zIEj6BAT9QY3dCBrz64s35dRqqhsBAsPizs4W8L2YdciMSXmuUhra4H9OvNyOPP0YalYTrtgEsJbnG7s1PSZbRkS1SjfS35h9X9b5of+KIHIuelXPvuBp4RWJGs4rfFV1AvtyTYcIWEVAdjGRvMsm3/yFXftaL1uxQxl3RAq5Mt/oZDvjZwtaA7zb5BRbcTVpUBvCSiruzMAWRew8X/OSoQ== X-Forefront-PRVS: 067270ECAF X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(39380400002)(396003)(376002)(39840400004)(346002)(189003)(199004)(48376002)(6116002)(97736004)(68736007)(478600001)(4326008)(5660300001)(1076002)(6666003)(2906002)(53936002)(16586007)(3846002)(66066001)(6916009)(316002)(15760500003)(47776003)(50466002)(54906003)(6486002)(50226002)(186003)(16526019)(476003)(81166006)(25786009)(6512007)(11346002)(446003)(105586002)(7736002)(956004)(106356001)(2616005)(6506007)(36756003)(76176011)(386003)(59450400001)(2351001)(305945005)(486006)(52116002)(51416003)(26005)(8676002)(81156014)(74482002)(86362001)(2361001)(8936002)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0202MB2782; H:orc.pedanet; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: axentia.se does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 23:iYuDD/jz3stfjfUBW9F9hkH9sq9BclbgemrLGjjuGIaxNHylOmH/tPa9isf7359mN5+8y+oiTqya2+IceGThaQmWrUcU+wAkVGJpZGDrk7kTCSeMjhk8rF5Bw51zK6+pzBSSH63ITWzClLavOtt12QyuJsVXbUgcZ5r3LHbRbFU1qELimZbIcMeV4Emqi01RCONDchIqA17DtX901hq7kEkiLUVamjeKXuTDHZOjUtmGkmJzzsrE+XFoTEx+w0kgK6vnLKCpNIYTuwnkXq7C9IhJGCbw+dTJqm2RKaOWaM8JFkRXTL5e6yvi2E+BE+JBkqy/UoSC5r8RUG6yJuXjDWgVxpB05Z955NiRWH3HUry8jIJxrlc2scfuDA7KrDIKtStYDJ1BXATlz/S7LGLMj7U+ydj+27WXVyHz0IiyEPECT7RPEyZa300hJ0+d7tAlgpkWQrpHta+Bs0ufWsaHh6eKcxGK0rbEcsD59e/w2IcU40LfrxLL3U5HWIDEkYdb4k1Tj+aDYdoSwXKofQx2Y4PrjBrIxxMIa1BbdDVUL9aQUWHxCqfnO3yA3lyaNP4Wo4qoQ9RH1mnU3DJk4Nlig5ExMMgqNEM2uLbALTL8AHlXODQuKbOOxVctP0zKIaJe57W4Yun7ErR40RKhi/YsVaaS55Zg0tQ2g40rkjwBkIKUsgfrgEtnI7th+YudbJlySisyfwxOmzC/FGK5o4p+hjaeHcKG5xrPoGNk/Uq/ooqDsBaj2im2OaewUXkmbJ975IY0oSV8cztddBCig++WHDveTazXOocXs5Hc4+ccC1iun3ixObpX8c+lSELYiVL0Dtwo/zx39i9lNPmyM/V+ilSu/lpRlfYn4KzhMeHkDoCFyruq4iRf7afsaCc9VhL3aOmI5UN26K3jJLpygHTJZL0DpOBdKO8SpPXzYScP9EagsTsk+6EJ1yziW96leLzSR7rYpMdfE7SbRMLl0cfr3HKP6a2EK12v5zbN57Micaft1OdsjbLhmpNWh2S5b14lBsIqGIcsGzdgcEOwpwLf2pCpXak0Q0Cq0sP+MGucmzR8RXZ3f0q+eVUKPYILGyQN6faifzDDJyr0LiqG8GPgfpuWaNeLE4ED+8wrZUmLTlgPSme8ilHtvoV6GnBk9HRhmJEXCX9NPzteuTOclIouQLu9TYLWazgn9v9kBPy0/E8awQg64E4uth79hSfOCRirAtWKWGrmd+ve3eDbNul3AI4mg3KyDE09DSGrQ49iFdkbpcrAo0uI0xq/s4sxWzuRNrdIFUSB/dp7O6vRhppogxjNhuGIstnxY5IH8C5Ijp7mFARt4P+A3knFqEnaGMv3m3kh3ZSSfvENOD5oKSnwpQ== X-Microsoft-Antispam-Message-Info: 5eTM+LQ8ubQoSs374nGGEkcRurt3cIobzR35KkwCfkUMXKdgFeW0bbsyY5ZkGa1oDJVP0aA/24jQCq84+m846TqLtt5jgL5CgoIKVnN1dEmL9ZkfhuWfS0rm/k294ADp74yi4V11x0riHZ7ShB/gC22gJ1J6ymKZVILgZ/J/p7pNsP8UH9eVOFxtVfmQqLaY X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 6:Vy3A6qngrNa+Dfyavc4Ova29dH/TZgb06c4OjnFSjDyWxCId7CceAwgxZ3LcU1RilpGCAGaAu0b4bdMF02C7eyutkt7Y1rlsQGCIfi00VokkjaoTFccJtXuCEOrLTlEr8HHdJK7J3Z7EqIsS2wt6qbJ5HxAn8c+krA5NCbxDFQU8C29l17SDaa3TbVmY/oK+LlfV7Ww1Yjka1jOPQ1Ne7Jq1DoIsDDxIw4NR+eZfan1BP7raM0OKKoeNjDSwr501/mtxXNP1FCF55FufBlwHLne2S3nZKt150zIjuZW0e0OZ3sniP8frIK+2FuqITXj7i1VwrOXa6v66JfkMmE6IwpqquUx036ti8IrP35VaUJRKLHr5/0kJemjZ5pE6j5K9xdJVJke/MYI0OjRvKv+IMpCOKpVaKyaYvLVK1ZBa7ulqsERl6KZSz4JQywSd+Pe2hldCgN+1vuPUanJ+D0puFQ==; 5:xaCwjUhLDXHMKq900EQ+eVtMFfzx8vyqReuMflbtEVJf8vhXlzdap7qbA32q5h8+LsMzsqSRtKuT2fBPex16U0W2c+k7SKWCu5OlXP3VlWIv/Moju1270HB6VCslUKSO72CoDEZ92SXPrMKRwI/ZKGQ7h83UL5HXrx+Cgk9Uhqs=; 24:TB6yA6Hu0kGLmDpsHH+3q4JBJ9hE7rZCfSfAbf9rsgwize0rkGcBFgizhcmJWcGkzc82UAYY7/AuVr+ohEdmt9tOuBdSbEE4V7OJR2qJjQE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 7:AqiHSQ5sH6Jhe7oG67tXlnBG0tzDEjT1MUrQhW3QngqxwFBTTceoWjXHmkVlltnNTcVZp8heUPFQRmZ7HQGlRDG3mVJn9ynRSP36y+qqwDU0NrEhNVQTeTjrsHplwUitRevduQq7d1BFmvvoR8GC8NvKMMSzSS6lM4kLKy5xhUEbSv9B31/1cVw2w2h/JHFa6STEHHqFhBRByWarbxBXlKZG+NSBIjahMU/fzEAN90MR4e19kklet3AcaVwMYnCi X-MS-Office365-Filtering-Correlation-Id: 59c7737d-6dde-443f-13d2-08d5b9aaa5b4 X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 May 2018 14:54:51.4195 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 59c7737d-6dde-443f-13d2-08d5b9aaa5b4 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4ee68585-03e1-4785-942a-df9c1871a234 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0202MB2782 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Because it looks neater. Signed-off-by: Peter Rosin --- drivers/i2c/busses/i2c-pasemi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-pasemi.c b/drivers/i2c/busses/i2c-pasemi.c index df1dbc92a024..55fd5c6f3cca 100644 --- a/drivers/i2c/busses/i2c-pasemi.c +++ b/drivers/i2c/busses/i2c-pasemi.c @@ -121,7 +121,7 @@ static int pasemi_i2c_xfer_msg(struct i2c_adapter *adapter, read = msg->flags & I2C_M_RD ? 1 : 0; - TXFIFO_WR(smbus, MTXFIFO_START | (msg->addr << 1) | read); + TXFIFO_WR(smbus, MTXFIFO_START | i2c_8bit_addr_from_msg(msg)); if (read) { TXFIFO_WR(smbus, msg->len | MTXFIFO_READ | From patchwork Mon May 14 14:53:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Rosin X-Patchwork-Id: 912994 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=axentia.se Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=axentia.se header.i=@axentia.se header.b="WoHuiasU"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40l3dj4xxqz9s1p for ; Tue, 15 May 2018 00:55:05 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754094AbeENOzC (ORCPT ); Mon, 14 May 2018 10:55:02 -0400 Received: from mail-eopbgr20092.outbound.protection.outlook.com ([40.107.2.92]:12352 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932507AbeENOy5 (ORCPT ); Mon, 14 May 2018 10:54:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axentia.se; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=Vpt1ZxwqwCWFfSrDX16A2SleWLAwhFMHCb27QTmDleY=; b=WoHuiasUXFc9swRYxRnpAwSeLyZZCJKdD7PodWGUQ//fBLhQ/DQr5cPDS/FpcmgTvPxnEdJzD4VgcuL2GVLj3c450qaMHnuX3ZvoWYtCA2chOJl422IdWj1Ye76TfKPVX5klMk153HLrAZlXPNj7GVlEnsnVJCt0AmmlsDhd2io= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peda@axentia.se; Received: from orc.pedanet (85.226.244.23) by VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.755.16; Mon, 14 May 2018 14:54:54 +0000 From: Peter Rosin To: linux-kernel@vger.kernel.org Cc: Peter Rosin , Andy Gross , David Brown , linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, linux-i2c@vger.kernel.org, Wolfram Sang Subject: [PATCH 17/21] i2c: qup: make use of i2c_8bit_addr_from_msg Date: Mon, 14 May 2018 16:53:26 +0200 Message-Id: <20180514145330.4857-18-peda@axentia.se> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180514145330.4857-1-peda@axentia.se> References: <20180514145330.4857-1-peda@axentia.se> MIME-Version: 1.0 X-Originating-IP: [85.226.244.23] X-ClientProxiedBy: HE1PR08CA0043.eurprd08.prod.outlook.com (2603:10a6:7:2a::14) To VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(7021125)(5600026)(4534165)(7022125)(4603075)(4627221)(201702281549075)(7048125)(7024125)(7027125)(7028125)(7023125)(2017052603328)(7153060)(7193020); SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 3:4XmT93Sdo8jtRaErOx+5p6fwMA02LqICw9Ao4QzbuIRNmi71vGTdjNYAZUx3COJ2lmChfQALvtp8xOXa520g7XW0Nv6cxZXDv6YUGxyNBawKNTRycjZHAc2bNOCNEx5M10FELHym7LB6Ka6RUOsKIVwRsxKfd256jTBNiKk7LVzSRdPWVvf9SvG1Ov0ANHGkUlPHSxYiTzSANDcpTUE/Z950ZlNBfDC01prgpuVTHWGBHbi6k47T3Exh7YtB48rz; 25:1tathxGoH+iPQNAhZG5uq//h/9lNpR5mUfOE5iD4uAESkpTXODgwzLuKxSrMu6sCT+mUX30U783mNF/3q8fZEoA9Okwi7ehpviCw/1lU+GvHUIRqcoBcQCDHk7JF63c66w0hztabW/cNYEpe/PfL06OWmaQbCL91k3AQqpz2kipKq9/iqG+qs3+SUYp1cH9oBP0OT1zE6VBEZ3Tfxi0fsB1fNd4beBf2QLoUgavoAh+RK1kYFpoyrw2soXmm5aO37AxJT5jBCr/LNKkKWXUHMXrsLB544PM1xEZCeTlEIhX3FmhAU39bf0S//gVQVxaVlxNZGb4msqTd+vwtv9TbRw==; 31:gC5CRZlgpdd8mU0UCfjpVSjiol8Z5Kix4bLH3gPrTdt1sfmK0hfh7hfoXUc4eoxsXloBLmePbkbNlSfYxYzHb2QWHUGY9cnUjcj400SAwUT6dD9dIERxviYAnDKey1POZPvKg047upUlb8TAArhJeg1UHrFTIGzZsrlKHblCmmJ1UPwGHuRolLK1xZV1oS/iofKHUGAf5rW89bb/eaAoQqbIomHJYmYrpYWqu1pPjp8= X-MS-TrafficTypeDiagnostic: VI1PR0202MB2782: X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(3231254)(944501410)(52105095)(10201501046)(149027)(150027)(6041310)(2016111802025)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(6072148)(6043046)(201708071742011); SRVR:VI1PR0202MB2782; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 4:AjoNifd2Xsi1NhJnZV7U0tpCZ7wXVKePx+xxJDn+nMdJ4dZNak3VDw6TZg1FSwjz6IGrNxxN6QJe2yO7Ch89bMAP2ONlppwk+yjYANnJKymD4nsuNHG52Jnn+gV60vflQ4TVhmAJQETwpHiSIA6GbEVZ2bD2InSwkY5yKNLksPWUlXlgBS2kkd/T2AVW42Qhl1i5au36iSOKiVGI47ZAVhEwaXIMH5deXlYup5bWZji+GcFv08LcqetlO1aEMLjL5ryAZfnrjMG/wVBjXcCT3Q== X-Forefront-PRVS: 067270ECAF X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(39380400002)(396003)(376002)(39840400004)(346002)(189003)(199004)(48376002)(6116002)(97736004)(68736007)(478600001)(4326008)(5660300001)(1076002)(6666003)(2906002)(53936002)(16586007)(3846002)(66066001)(6916009)(316002)(15760500003)(47776003)(50466002)(54906003)(6486002)(50226002)(186003)(16526019)(476003)(81166006)(25786009)(6512007)(11346002)(446003)(105586002)(7736002)(956004)(106356001)(2616005)(6506007)(36756003)(76176011)(386003)(59450400001)(2351001)(305945005)(486006)(52116002)(51416003)(26005)(8676002)(81156014)(74482002)(86362001)(2361001)(8936002)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0202MB2782; H:orc.pedanet; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: axentia.se does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 23:NazMYFrKC0C/Lhcn1X2IsQkeVlU6qvXrAzZeVNd8KiaCjnFv5S9LbZABY5V1LOY0EeyCVG+Iv/iM/NFjM2O78qaeoSlWtv3TjskSr5/WcSIZ8Xosp4COJh90giTha2t+Zo7JrR0jFOWChbldCNRSjfUAH5jHRNaRWZQvY+LxgljP2tRQ4W86oJjIQRdSW6biBk6QiHshV6nnh+VAHsVkr6yjyVEHQ7iGrSKpoJUIH3ieyrpMD1QHpgTIL9FxLpGCevHfvZ65JYKqoLbB/PW+WuEY6VdCFd+/4IYooW589eBs0JrI4Ot3S3Mo2fdiddSdlDBRABSVTI7efKRRatmGhujAorRFLvELPuhShvvzHGZ1nfP6nVgydNWTUdiGl8Ak/xfXDl6+CbMieTiJ2/n4x+vp89VR5ipm6TBwWYGeIwbslSdZldE5lr22ZwLVICS5hd8dcxISdpH11ED0JHOuiwkqvAZEI9o5PTntANvycnE2uYQHDcVxEkRQADH5UeZmZ2FDz7qDS88y2RwZqdr8yhwaShKtakbjj1TyDV0lNn3l2mX6/w2R7GTuN+/Rq5t8SUgceusM9T2QFmd4g5+y5FpXjmZVqJnQwVBA984hmiixhqHJ98PXZ4s0IgBysYX3p+m0SS+Aq5mVwg986BXMGQdfJvaORBecB7XMHtc98QDvsANuQJncCQyiFNMfDjYIiU8ph55EWLPVpXz4iE5WIVxcmy4VxYe2sMfx4UQ0PYcXtyVkTNAJYAsP37xfzAC9JvdIPWy+M8pIpiRq5SUJsJZM1+2PsQJDoUk76zFlwNIdFR6oY0/WXEBYsVyePMKtT0VckJj7mJB9Em+ImqFmQ+GTT/OBoNOkCQarzZAjYiS6DuLabuZWk/SJPsOXkvh3MY4IiK1IiP+cytNHgGae+1ak9R6q+0HNv3a9i5SR0Lj7QgzDkBOsSHcjnysDAALiAEAAaR/1aPVgkC/hyBxnCzNtoBJUAZZ2abHa9PpLKVo12rlZaz7lefAq4v8tcqQgFvRJ3XvEUxrEROcL+y9utlNATgQXLd6JDgYmujdyeqHD1BFfBF8ODliVGzEfBC637PvNQ2H5kitFBRCDOPELlBkm1zeCP1+u6fsvgJamuprbyZHqZFInZn0N2nG75/EC0805XQmUOgU0mw1jL7ZbakbA2QVwFVtR3eBrqutJM5oPeUJ/3BTTJVBE/9qNcGGobHUmnMZfkz1oZEfFbsgtzBNFycPm/egJ0FP8igQgADLqhbpSoOcn5lfcg3sTiqDTAY5lNPtT62cntPmG5GGnkzJ37VZ5TsKerahss9W32UBEOEDh/3sfUY/R1iJdIXL3PsZY7Kz7II41aq0zVK/8sQ== X-Microsoft-Antispam-Message-Info: GJLQcHeed2Es0qZmASJ65UhoKObxvJi12GYZdO6hl3uhnBlb3LKOjnF+pIaKBQ3Za0MWq84+ZAnzkrBeSsqUJD6fNYwsSktTyDenHyJhOE1r44vdqQ1cvk8AfKn+1tvW9CvZ21g5HkAu8AL+Q16UmDlukpUvqibDtiHOWcTKyqj7b4MZsx/ekfcpK69OMGyo X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 6:Nqnl5T0vaRnXDCZ0ZXYH04W8PeyS/3FH7A4y+hWcBsiDkLO56EVojTl/ocMM3MJtlR1KqMivJfzVJJYPRMiR3Zw9pyCGgM5YFf+NhEh7oPwQp45hD1qK/WidEpjshiVNiwSZvEmuJCIaWg29H0j6e0aHKL95vU3oI3y4QYeUHgBuXLBenpdBkCJyyFtxxJfAjOWXtisqUuf4jIvucqjKAbqkBcS94rwmIoR2uxGQI2peEUAUX4aVpJ179vzB93YX4UwoRYytyaOo08Ta8UlZNj6ySBm612n2HMDJtKAgZWlynUHGm9fbWFu/mbJ0llPN7FrRcoLACAMr+YszFnh3a0IxhxYYR8UMIP9pLUTI17DUkprrok/Zt/U1JQS9DqLaicXfCthcosBiBuVxRrh/DBGIe4G1JPJ3x+X0O53ZTzllVS3kA/jgRk6of8blVhNWkOLWXlTSy8X3aH3JbyceSg==; 5:ZuoG3eyzfsp+pCoGxeo2PowaJ4EruAPQUGCKB2WRtJ5hWEa459V4882+bJcwJ9KrFJaJYMfXkauA0yPpKOMP0aYiTa6B3e/JhHAW7VK/ZCRmIFcJp80C/yDZbdhXjxl3FFVG3YFlWQdgjeTRzjbW5SKVa2e0LLH9Hx2NH5w7UM8=; 24:gb9fSirhiS/wh6A+BpMVNbSTGnoxHuFEPrA26M+HTaKywN/GaxG/UBTxl7EK5uU0rkR+I9Xy4aHn36VpWhIUaL/WQ2AZZFcJmmXjjvfYcYc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 7:GtHoQy15HELurotoYUqIb3Y+E1h+8ioUNidn6VsVqFRfMo1NuN4PKa+94iIBXW1H0FbiF4r57mVFIlVpAwF3qSHKXUxdQti5p1jex8OWllr2BjSy5Qv1F1fR/skTDmkKLOi1v6p4NVZhWYzlrAxbTUvN/ftr6811aHGaf0bkx7RIIfOmfFxNXpvICnK1Q7TvgupAE6rPiYLOXwSct9oLSh3OqlIqQ4i9JtByfk5VnRsgUMG7eVN+qZJ9qUSJj2UH X-MS-Office365-Filtering-Correlation-Id: 854a3c9d-cb89-4dd3-89df-08d5b9aaa76f X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 May 2018 14:54:54.1226 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 854a3c9d-cb89-4dd3-89df-08d5b9aaa76f X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4ee68585-03e1-4785-942a-df9c1871a234 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0202MB2782 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Because it looks neater. qup_i2c_write_tx_fifo_v1 is always called with a write in qup->msg->flags. Signed-off-by: Peter Rosin --- drivers/i2c/busses/i2c-qup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-qup.c b/drivers/i2c/busses/i2c-qup.c index 904dfec7ab96..025232207aeb 100644 --- a/drivers/i2c/busses/i2c-qup.c +++ b/drivers/i2c/busses/i2c-qup.c @@ -453,7 +453,7 @@ static void qup_i2c_write_tx_fifo_v1(struct qup_i2c_dev *qup) { struct qup_i2c_block *blk = &qup->blk; struct i2c_msg *msg = qup->msg; - u32 addr = msg->addr << 1; + u32 addr = i2c_8bit_addr_from_msg(msg); u32 qup_tag; int idx; u32 val; From patchwork Mon May 14 14:53:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Rosin X-Patchwork-Id: 912998 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=axentia.se Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=axentia.se header.i=@axentia.se header.b="Id8RlI7R"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40l3g41QP1z9s0q for ; Tue, 15 May 2018 00:56:16 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752356AbeENO4N (ORCPT ); Mon, 14 May 2018 10:56:13 -0400 Received: from mail-eopbgr20092.outbound.protection.outlook.com ([40.107.2.92]:12352 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752320AbeENOy6 (ORCPT ); Mon, 14 May 2018 10:54:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axentia.se; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=1O8/CReVcd5/eHJYSLBhZp+PoDwOcsxSVy4w8j4/Sbk=; b=Id8RlI7RIeK8KT3Fv5H1u8PXZ4MywJEexD8pDDuQX0XDcA8SkEfVGjTJOf+VNCW9Ch/iCSVpjb7mhTcrO/RMvqXYcDAFiJBUhM1Zl/4X+Ic3vY4259XuKalYmRZb4AGlkvp/x0hdFV0UGwxyjMOkoB1IkLHwOugQJ3ntYr2eZLY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peda@axentia.se; Received: from orc.pedanet (85.226.244.23) by VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.755.16; Mon, 14 May 2018 14:54:56 +0000 From: Peter Rosin To: linux-kernel@vger.kernel.org Cc: Peter Rosin , Wolfram Sang , linux-i2c@vger.kernel.org Subject: [PATCH 18/21] i2c: rcar: make use of i2c_8bit_addr_from_msg Date: Mon, 14 May 2018 16:53:27 +0200 Message-Id: <20180514145330.4857-19-peda@axentia.se> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180514145330.4857-1-peda@axentia.se> References: <20180514145330.4857-1-peda@axentia.se> MIME-Version: 1.0 X-Originating-IP: [85.226.244.23] X-ClientProxiedBy: HE1PR08CA0043.eurprd08.prod.outlook.com (2603:10a6:7:2a::14) To VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(7021125)(5600026)(4534165)(7022125)(4603075)(4627221)(201702281549075)(7048125)(7024125)(7027125)(7028125)(7023125)(2017052603328)(7153060)(7193020); SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 3:DB/G+uU2VJCn9uxV8kYqo58e8JNT19TD/X+6wsKJJjlUrSG5qW7L9Cdmgz3YkNbtBGPkThmBFHvdLuJameFhY7Zs0aP9Opaq7jKlyWVeQ74mcJUU43ZZajlP9ppKKAsG/53920VjFty8IJrOmg5JOPtWNBFGvEZL4FAAsxjCKJJWwCtBpiN40dLY90TPsaho0fKLe9Va5pdSljjQ3yh/ikltOzroE4LDF53tLrSt/PGfA8HLM8D+C8PMigIj/Xx1; 25:MTBHwoepkfYvm2cGhUbkmiIZCogosNi+H4O9uFfV2Aydb3wRVdU/1z9yqqxBRObVFv2N2X5GHAVqDBh+xbMaPDurMwy386ByYkLHxiFA+5d6dso0S4polvuS6hn0ZkhDDCuUyOGYLr94TTHbYAewA2EAfoS5PDUuhjAZzwwXfwVNiMYfP7jryHbl0ECat/1+GRimQquw4VlL8hq27zYJR0XKerKA8gsKyLm7dmm9ky/7kJTPF3f70MioLJ7Ipj00o8vyMU2KJGRCzJS6FIotRdXoenmg8To4C6P646JlVyAKSV9e7+oE5RTV6+8rwt58zpTpef0wYVEa2UXbwHkyMA==; 31:2EegIgl/HxOl4/4WMKPZIoHbNO44o6Y3yd/rRLS80GZCJI445aA23RMO3WLKLlP91jpWZDwp12KAfrqtuTFaTJY+dwHkiIWieSeUhvlZW2KIptqMkC29e4NPTwLLJACgfijVE/YFnOSL07rYEiVRC0q718zfr8WN1MaCCuyemPwtTMfaikxHiPRGj8N/Go2YKLYkF0Eb8hUyDnLVD9B4wGLZuHKb2UX+/lBGT6y+BZM= X-MS-TrafficTypeDiagnostic: VI1PR0202MB2782: X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(3231254)(944501410)(52105095)(10201501046)(149027)(150027)(6041310)(2016111802025)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(6072148)(6043046)(201708071742011); SRVR:VI1PR0202MB2782; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 4:yqqgpnDZpUee17tTxXhsms14f2R9cezvoeVT2BZ8pcZ2OdblL/bmWewLpBvoSUtIkrV/AlFMkrFtvlKZsqDmIlnaZ6BX3PSv6B2lsNbKWTfq/vtMeBqQ4eDWHOzCKSrE/P41OubPRw3FvwXWHc/kKKfb/ccG+P3/oxlU7sdzjrlHj5v20yZNTxuHw634VGThaIXvZTRzrtV2gM3f3NGidYHsjYjEUkcJmRdcQxVyqYTSBS8JvPNU6aE1l9sN3PzCc2J53yPEqB1YOLFJxNDhAg== X-Forefront-PRVS: 067270ECAF X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(39380400002)(396003)(376002)(39840400004)(346002)(189003)(199004)(48376002)(6116002)(97736004)(68736007)(478600001)(4326008)(5660300001)(1076002)(6666003)(2906002)(53936002)(16586007)(3846002)(66066001)(6916009)(316002)(15760500003)(47776003)(50466002)(54906003)(6486002)(50226002)(186003)(16526019)(476003)(81166006)(25786009)(6512007)(11346002)(446003)(105586002)(7736002)(956004)(106356001)(2616005)(6506007)(36756003)(76176011)(386003)(59450400001)(2351001)(305945005)(486006)(52116002)(51416003)(26005)(8676002)(81156014)(74482002)(86362001)(2361001)(8936002)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0202MB2782; H:orc.pedanet; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: axentia.se does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 23:zwFn3ViAy0ERmsUx5HR8HCOVZZ57X4Uj+LYdOGyDV0Yj0HxX0f1BRQFP5L+jYCJpQ7OzsIL04EAgRylPJvGaiel0c5eUGXmbGQ+HexuWYLJknpvORzpUyVYughbYmAfZCKlQXA7htO/Gfqt50xerfsIY/IaM6Coj+kCWyGN96YHclvgSVlL7NHrlMvkMQuJ/uZlkoJZyC6fIviDpCIWUMxcybHVG01iHupPvyMEiT7QrcB3yCtB/jmT4qqOnhm7MlJNjP0YvcfUhKVJ/Sj9WbrscEY7oXK66FVAPKb43gzbc10Eu5G4JBgPV9FMddVlmUEJFOPllpIVlwQ/Eap/9moqRNppnbJa3GIEWml04zMO4nh01bVrTUCSSWOhr3MS6my86uGBa9uh9clq8tkPJgAczxTqSrCf68gJcUrxudNbZJucRSlj/WMfkdlyuGqRIdB/6Wz52sIxjN8ALIFj8NxBiVCSJ4DUaEYz2PsHBN6flORxttJ2u30i2FyaYPjBG3+k728hfv15zMvnIzEGYFqm2Q92Kvy+UykHKPrhlnZuxhgRUfCyknX8O85JB51Rc1sHdLs4e9+Ke1dVXuKdXOy9XkMK13Jk4my6Cc2iaNZEf3q4Q2UtiUqEwrxGCZclKSVqCDybWVyTq6ZnWPJ5FoAjTmzkzq42TDNKnUq7CybBck/zku1jaiHgo28kzLlIjtI6DeW2LXNntUk6hApVLl3Avp9GS4smJJnyo11ab7XMgdjjMWxoXybB06hnTfJoiZ9cQhasGIGvmnSI837wk8xnnfHAXZscNLPp8cLSUJHTn2dASb2V13aHzjw6SJkncSuZSQ6h0caa36Q3BxblAhls47rwsLHukTUIzYO+SMmUOT2k8aan8jfhqoyXcF10zjx060sRLaEHx9M1XeJl+/kJgXtsUdeQJ1WkB1G1istfOnCxeZnUnYPDWbiEVSGzoIgmslpuvdtW6/rhzw9DDECvAR6lz2pGikV8tSs60BgJsbM721mKN+EGM8b5ixz0DTFBg5+xEbk6eVBvITPo5kC711VOHULEr2Bh4AImfbVZhWF2gvoE66bSxjNL921+IavglrJc0xD8Uw76t4TntHF5lOP2WkW/Q7hNBZRF+UWVkUMKiSfmp1X/bEpMjw7lVkwxkSUjwRhvYH8hNBa5IwPZ060uX8Bed+UPV121C6AynssR08dD7D6bjaH2ZSgJlXc26lmPU8DLCiryZBAJTrlOza2NvnnLFDIrqYfuHd/HFZJsDogIbAvQ4IyqMsgRh8xN+Z/kUwlAToKiADSGlXcpy0Nlgoos2gbM8t53u/ZGTN9/g1jer3Dkzg4CFGIYkwVihzbihoFVUsfsVotx/6w== X-Microsoft-Antispam-Message-Info: jjOKRrI7FFvXas6cuuB2HwfNbmBxoo1C1b40sFuDnv7OFirxiskvEa2ObuEE1Rs1cO8TxXrg1W8bTkXp+T9aZ2a4Bwqgqn68/DAJjOxHi6E+F9cJXiEOZpfdYIzc+iXFEpu5kU0WzCiAwJ6FWc1zW8+LJLBpkDIbA8UlVyJ4B4Z/TIaIF9n9hRL9OSjSFoPx X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 6:+XtIE928B7gE5kAreJ9jMiFUu3cvZhsKMWD0zNOvsfXh+/YYeyHvJ8qU34EKQG+QzxXJxcIC+xalFTRwJXPjsXl1DsyllcjnzssbuvplZHmAlJJVnWtoCAtKFSwtqv2iVXyMoVvYtXmU063yu7LfwFmVg0DlmupwdWejAXoLKP8ue0wHzfK/43xFv6rrd/j3Y78QxsSf9Tt7lKZQO3N92QQxNcrdcRLVuOJkIza8PpBQzEC86VJs2aRPMAUUulJAYi0kC/WDE3U5kkqLqNV7KaD+JpfLw4BHsRdYJodCizoAxrFA8vpdvhwBTdX58VQzrMyjJc0njWs9cTxH+lVBPM1sCweBbS+daAn9b0y2nOPhPmoRPw1e8e6U0yW1iRY8XCmUaUvs/dtDsE2NdWulVk0cxrSLMBvy/UsLFLq9crZcirTX52QyhamNR7dLjNWdoF8ttGVKaX79GqeHT2vp+A==; 5:TLPwIMzb0lgrn9SS5HW89GN0ZFkYZJTWK19iT2VmWeMBdz6A72n+nkC2i0P/Xx2DJvkJeAPhSs8IpAT4RN29IcAzT5Zcckghj1uqgTY4VPvOtjLU1RLlkU4vnZr9dSMtnvK228rG5w1G/Hyd1K2MbB/EMWAMcnZB/9DWNmytmCk=; 24:ADDDlAjd/hzUbtfa8CkmEz5wlmxKNME95veIt+gJRjldUON8PtRPVXKrzuvzmmkMWBRIPUEsKW3a+2SCBkPogwzjaxsFnsm7YxFy9LRJGfE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 7:IfyRsHB4udxGBz3k2OC/70J5NN6jAI+wayNotpqbi/mpNKLi8L+kWEP2yzLnSf+GOzx/3rEOLS6FxlF2Qb3ngIVL2cyl6ROX7GXPN/UWw0n5zybQ93mzhrn+Y6NEoxZ33qUxZQOIAT8UZdWffd3p98v7A684g1TNBZhQvYCsp7H43WA8wrBSq5407T6Ut8FEOi0dmTNnf82vYuPKxLRyDTtWfLDg3KtPHkbcGXzXvam2ULmBprPXdJJM6arVbVbf X-MS-Office365-Filtering-Correlation-Id: 0827b30f-21ea-4e30-6514-08d5b9aaa8ef X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 May 2018 14:54:56.8883 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0827b30f-21ea-4e30-6514-08d5b9aaa8ef X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4ee68585-03e1-4785-942a-df9c1871a234 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0202MB2782 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Because it looks neater. Signed-off-by: Peter Rosin --- drivers/i2c/busses/i2c-rcar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c index c6915b835396..17b91ddbe013 100644 --- a/drivers/i2c/busses/i2c-rcar.c +++ b/drivers/i2c/busses/i2c-rcar.c @@ -329,7 +329,7 @@ static void rcar_i2c_prepare_msg(struct rcar_i2c_priv *priv) if (priv->msgs_left == 1) priv->flags |= ID_LAST_MSG; - rcar_i2c_write(priv, ICMAR, (priv->msg->addr << 1) | read); + rcar_i2c_write(priv, ICMAR, i2c_8bit_addr_from_msg(priv->msg)); /* * We don't have a test case but the HW engineers say that the write order * of ICMSR and ICMCR depends on whether we issue START or REP_START. Since From patchwork Mon May 14 14:53:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Rosin X-Patchwork-Id: 912997 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=axentia.se Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=axentia.se header.i=@axentia.se header.b="jCBI7uF5"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40l3fr1mb7z9s0q for ; Tue, 15 May 2018 00:56:04 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752426AbeENOzr (ORCPT ); Mon, 14 May 2018 10:55:47 -0400 Received: from mail-eopbgr20092.outbound.protection.outlook.com ([40.107.2.92]:12352 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752325AbeENOzB (ORCPT ); Mon, 14 May 2018 10:55:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axentia.se; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=ENXPKIe94bYAS/TiQ2l8o58bXkKgVCSNDkU6sLmoI9A=; b=jCBI7uF5I7Sw1F3+nVN7Qmh/FwwjKO4jaNdiH66ao36ng8p41t3+AwlLkL6l8qxjIr/T4ka7wMgfLEsTwg5vJRt1sTeNG2zUqz01gTJyYG062AO3ATz44l+LQFSJiKsYRcTzJ9iY1YH02wSSqMJCjDwg9anV68cvrzqjhfR+0bs= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peda@axentia.se; Received: from orc.pedanet (85.226.244.23) by VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.755.16; Mon, 14 May 2018 14:54:58 +0000 From: Peter Rosin To: linux-kernel@vger.kernel.org Cc: Peter Rosin , linux-i2c@vger.kernel.org, Wolfram Sang Subject: [PATCH 19/21] i2c: riic: make use of i2c_8bit_addr_from_msg Date: Mon, 14 May 2018 16:53:28 +0200 Message-Id: <20180514145330.4857-20-peda@axentia.se> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180514145330.4857-1-peda@axentia.se> References: <20180514145330.4857-1-peda@axentia.se> MIME-Version: 1.0 X-Originating-IP: [85.226.244.23] X-ClientProxiedBy: HE1PR08CA0043.eurprd08.prod.outlook.com (2603:10a6:7:2a::14) To VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(7021125)(5600026)(4534165)(7022125)(4603075)(4627221)(201702281549075)(7048125)(7024125)(7027125)(7028125)(7023125)(2017052603328)(7153060)(7193020); SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 3:1P1gjiNGh5fihZQfM4ac5nIsm8HQkAYYUnO7DeL4HeGkXwgEMXimO8bh7be631FckWr6Q8qb6RZ7T2A1ONbNBvcrkVOwn1dltd7Xgl9jiliKTG//AWXSHECdrVH2+rIBfd3Wz8RLZhqfPSJj4aWz5ZDpc/vmkHOEpR5/BqJbg42/baze33Y4iI3Wj9fZrZyUAsv+WsLZEIn23G01h38DVqFdZOfX2EtGdmLe73RmX4qhfLf15nZgPNtm7TtKB2OS; 25:gFLsR068Jy+sLsUOo0LR0gRzIJ5rmqVgkmchyD4xXiCZykzaBmwzV0IcE3LzMgOWRXv+PHEEpKz9CgN5tD1igw0R9gwirxFKE0qdr620BH9lW1UoYN5XI8xgchJQG2qz9EuAogbe5XCwJ+XpdrSMhyz/w9VNIs92TtUJfPScGxFVXaLZhnHfPBw+b2KZc79UFonREPAKx1dG2lrXXoMI++i3j6No19grKhTXdD/cSDJo6RRCLfPEQzAtQn2FbRRWKclrgvzq6VKaluQYWOJPGQVMGktSfMH4rccLCtc9BTonDLuwBt7K898DIVbvqMjcaYkfgVZazpUAVbdKW9t8nA==; 31:UrcMqepQiEyoEP94Gts7pqDPc8VwBNJ8Q0akp2Jht79vssD4zvz1hICDUcYI0d1kq1y4AhCzMJ/Dxohu+OPaYfz7tx6KZH7Nteb42GWrM+6EP1ZeLcNjN72wxEAgp196oMNJtmQ6gCoWa0Y/Alb4WAcnuoYahs//g7aedLaN+XYktervQwlwEn+7kXJEZJxoZbQQbFYdIN7d8o7hJNyaoUEuQyUlkFseBXL/Ma2sIz8= X-MS-TrafficTypeDiagnostic: VI1PR0202MB2782: X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(3231254)(944501410)(52105095)(10201501046)(149027)(150027)(6041310)(2016111802025)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(6072148)(6043046)(201708071742011); SRVR:VI1PR0202MB2782; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 4:Nq7brudCE4WKLcsRBZjMByARuYiu5U+GjyUsQlqgDrr1ttwd6iUmC1yG4V1MpBQkxcLvr+YvzBL00JLEdWdJ6EDxLmbXOqKXILa7D5TR4F4EfUnYmcNEgs1x20u2REm5sdZ7+V7iqVP22z1X7JlPoWV0TYSumjsPHrPo8xrFw2Z/mOuneURCythc947pfxiUTfj39gMvqhOqU+6tyPQFLnsDSYdtztcKA0C1Yfbde5P/m0yvYdi/8cEzUUzLBbAL2CbGDQhZ6a505NAWphzuGw== X-Forefront-PRVS: 067270ECAF X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(39380400002)(396003)(376002)(39840400004)(346002)(189003)(199004)(48376002)(6116002)(97736004)(68736007)(478600001)(4326008)(5660300001)(1076002)(6666003)(2906002)(53936002)(16586007)(3846002)(66066001)(6916009)(316002)(15760500003)(47776003)(50466002)(54906003)(6486002)(50226002)(186003)(16526019)(476003)(81166006)(25786009)(6512007)(11346002)(446003)(105586002)(7736002)(956004)(106356001)(2616005)(6506007)(36756003)(76176011)(386003)(2351001)(305945005)(486006)(52116002)(51416003)(26005)(8676002)(81156014)(74482002)(86362001)(2361001)(8936002)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0202MB2782; H:orc.pedanet; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: axentia.se does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 23:hMc+qiJQIais7tgnucVRByf78xt6y/c1rGlCsf2x2Hzd/uVXxVe0669MUBSD+kA2m7mu++qIfe1yUqH/WbqmJHo65l7/N/QFJDXH5oSZjiKZRcavIZMQ4aqh6Z3bYanp36wG4plFs80GKId0rPCTziv3HhQG3FiVJO3d4NmDQkEBUPvdPi+P+0j8oZno3ERM6+hcBZT67HuMBVRfQFWxElLLLQ09U3mAU1MKY2t2FDs/y1htK3YQe5WYFZM33+1bB6bJkLEOIDcStqBIG+Bjgg0HIW2Cr1o5BoDz79AR4W0Ut7qH+oF/dGsfp8zujbLQzwoRn2EBZzZC5+iuu7kro2lO+R9FXEJfkxQ4qCAOHTkMVj6VHHUbGoOVYZwvzSHKJl9iEfaWpwj55XtxpJoOGXaIXoUcCH8ZeXiCRdTF3dNTL6I4k4Aeyy1VVs9RWn8T78Atnuf8UdXLFTrziEX8xG1a7Zic8wsvww744K7Rcw/SQLm/wF/l5tSadnU9zVjcYyGRv3yhEdoma04KeIXuAVwP/o/oGzNi9pt83tKVheVG1DjXmqUG0RK9n2MhrcEBL0BP/fGzS66eyT7WV5XL2l6r5q9uOP179gHUN1M+KrKBfLOgjJ8UrdO+nqhqdPuTiMlrUfGHWRFD6Fcz4R30jO+OZnJNJF8/+o6vg4MfJ9aV9ic+q+Ww1hIJrDnb4wugHUmnevqMNB86BDykZLbrQribsbMfE+Jncq73yf19JUMhxK4aVbwOuxBR0QWjdK8SRP6pO2Mo3emMpd3aOILzrdHVAk8gWwetfBFYoH+3S48181wwOYYWWJEsAP1QujCNOFjogWI+FuckIfx/6sqeXat/RkT1+5ipY+z1MDw7zh81sg33IpR8CpNzglDL5MLPO09kZp2rVqhYgXZWdygA24fAYzvyL/r4b0gyHjQel7ZEB2UkGXZHXrREJdplEB9iX2gZxoDR7jz/+Zml+RZBiDW8pm9UOG6MxsrwW7OrfF1jZgiw4FZghyiDdBnpi2mkv4ShU7aWx5iuJu0GynX1f62oYVxFd6KVmQMXTSznYn+zaEkEMO6GePkIB1txXsssTWTPAVHQ6bu8ES+GNfhV7H4me/85rcc9dGFeOamy/emyIO15j+ZMQ44gOO5A0+pzbk9B2lMNC4sYzGN8nv6xwuF6IyyZfSipfKs6uALD3Lgok/qgjJCLzOIjx/TdKZev0EQaGx6yFe23BT9wov8tHR+kPdi3yRsKe+KG5wyuUIZ8BTnkp5CDI6n8ShYOirHCu05keyyPH60lYRxh1s30MRPt69peKk7g2YqAjfPp0YTDIxD5nO8Ud41DZtaWvw3v X-Microsoft-Antispam-Message-Info: 7kj1wzDI+BwLN4BCL1A943ZrLhD1+JcFExH6vSmXkC885ielBk62iA/HvmIqRnZAVIbHnmhmcIh/N4H43G+FHoc01quf/XyrzwtatVJL5Kyr5dYglJUL3rq6sQb7lfX/uJZsZBOXwKTGDACMBOVp884XRCnNYPwHWQvr8AVGg74y0uJ/6OPkaC/xUM+d6bu6 X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 6:4I1REJciekc/UwqDgbsm2sy8/ZKOvpWAW9U/afzV2uPrWMZIx+L8yvcUBa9CcSBD7i3M4wZ3HBTjDy2dbu+OZsvze5XenREpZA16T+b3beKWqNWDJGImoH7exkzigF/dcXQpHwjMioooYqmegXgM9fQRkYsm4QIkm7dabOd7bDvwUHQO/cDCjK0jXFjYixcdMmsVaScjl8/Pa7k+1kohW14tXcxcN0Te/e1xFDs72P8VyAmno1E72678UKhA/0kBoRVOFeCKPo0WfTRoj5bjKIOx37meoIz/1kxfgkBJhHf7e9Nv+SVNwdgpb+XJmTJLm7tyLT1VSlFQ7i+PIPybWvfPa/t/xr2+x0gFrSwLFUvtHlgDovYTNdToaQr4R0p+y+aDTZLnlPH9hKriP1Whm1tYebYsx4ECuOFTLlNAowApv+xpl+D3Fod3tXcRZrlRJyzP9H+qAvUAg2qntwMGXw==; 5:WZG1WaOXY3jfj0GgzUMuEOWFHE4cvD2Rk/H4+SPQSlkxrYap7MD7AL7hVbZhDZw6YjzOnntRkarLagCwJDrDkl2/0sobl/3yM8C7WnfxQur01NrOA7uJ2BI8L8s37vQ2VGiyvvBl+64m+/Z0b6RigvQJcd89OjAGlmLkaz7XDPw=; 24:woXLqMIbMHRapl+HGTHYEiDMaw7p+IZ451WdhcZoogoBRndtKPPcbqaddF0cPOpo7lxKQFEnUdsQChKOBVxawjSBqzlA6T9eQof1F2lQVjs= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 7:lI3ixjOpxnDtpK7ZZ+qxDMRGk1P++oAcz2x3wX8iG3PRvlqRmeewAbwRIXAD/OCydblvfO0WtqofdDjVXZqYzcm8kt9E/OSvU41jyJVLThyZK90hu8vjfRy1jiIsIUVZlrLyDd5jaarCJ2eGQoxVlVAUk2UJfUtxJB/iNLhbI600JBM3FJeZ67UehaOEnZ3OFtmemkDGtFWxVdLjqQZ1/nFHwes4JeXoBU+BkaEbuGgDqjpCfsYXWCDBT7mDEDVC X-MS-Office365-Filtering-Correlation-Id: a7512774-fc51-4767-928c-08d5b9aaaa20 X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 May 2018 14:54:58.8883 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a7512774-fc51-4767-928c-08d5b9aaaa20 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4ee68585-03e1-4785-942a-df9c1871a234 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0202MB2782 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Because it looks neater. Signed-off-by: Peter Rosin --- drivers/i2c/busses/i2c-riic.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/i2c/busses/i2c-riic.c b/drivers/i2c/busses/i2c-riic.c index 95c2f1ce3cad..5f1fca7880b1 100644 --- a/drivers/i2c/busses/i2c-riic.c +++ b/drivers/i2c/busses/i2c-riic.c @@ -167,15 +167,14 @@ static irqreturn_t riic_tdre_isr(int irq, void *data) return IRQ_NONE; if (riic->bytes_left == RIIC_INIT_MSG) { - val = !!(riic->msg->flags & I2C_M_RD); - if (val) + if (riic->msg->flags & I2C_M_RD) /* On read, switch over to receive interrupt */ riic_clear_set_bit(riic, ICIER_TIE, ICIER_RIE, RIIC_ICIER); else /* On write, initialize length */ riic->bytes_left = riic->msg->len; - val |= (riic->msg->addr << 1); + val = i2c_8bit_addr_from_msg(riic->msg); } else { val = *riic->buf; riic->buf++; From patchwork Mon May 14 14:53:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Rosin X-Patchwork-Id: 912996 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=axentia.se Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=axentia.se header.i=@axentia.se header.b="TUP6Fyvg"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40l3fP3ppRz9s0y for ; Tue, 15 May 2018 00:55:41 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932584AbeENOz1 (ORCPT ); Mon, 14 May 2018 10:55:27 -0400 Received: from mail-eopbgr20105.outbound.protection.outlook.com ([40.107.2.105]:36480 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932531AbeENOzE (ORCPT ); Mon, 14 May 2018 10:55:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axentia.se; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=QP+sn0pstvmjcPTVFyXr02t8JuCsTGdEMktVF919ocA=; b=TUP6FyvghbxEkhFNXEVaz+0cKJestNE8hmo1SeNq2WDgrUeQgQ7DFDHQPOaVpioCquI9l1Scvq5D6rxqrQbxbbnqijHDjsQNb+xjg/4nNgjHGcdM3JlHKyYVnws9U6I9VFfF77DVNA8xpgdZyAeGmfrewGYbCzmriXGRcsiQRIE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peda@axentia.se; Received: from orc.pedanet (85.226.244.23) by VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.755.16; Mon, 14 May 2018 14:55:01 +0000 From: Peter Rosin To: linux-kernel@vger.kernel.org Cc: Peter Rosin , Linus Walleij , linux-arm-kernel@lists.infradead.org, linux-i2c@vger.kernel.org, Wolfram Sang Subject: [PATCH 20/21] i2c: stu300: make use of i2c_8bit_addr_from_msg Date: Mon, 14 May 2018 16:53:29 +0200 Message-Id: <20180514145330.4857-21-peda@axentia.se> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180514145330.4857-1-peda@axentia.se> References: <20180514145330.4857-1-peda@axentia.se> MIME-Version: 1.0 X-Originating-IP: [85.226.244.23] X-ClientProxiedBy: HE1PR08CA0043.eurprd08.prod.outlook.com (2603:10a6:7:2a::14) To VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(7021125)(5600026)(4534165)(7022125)(4603075)(4627221)(201702281549075)(7048125)(7024125)(7027125)(7028125)(7023125)(2017052603328)(7153060)(7193020); SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 3:39qAiwLH2KBXIAwuYQXAyCR6w9royC1ib/vPzbpX2NrrDovux6ixU3NUnAJy9coMzfV3ValDjOw21Bt7Cj9s9oBylI8NC810duBzcSDJKJnwXDHwABe8QtvYgJREWIgkxDDRFEtBYT5VdHBoLcbqP4ciP76JJKRxFTF9tAZCsBTDPgPGDDvk9JYxtPI+/8GVhhtafzzT9MjHpMADqvmJCs8BfHf50LEvoT3Icwk7lx/7ZKlshJxmnWuPjjgyh9u1; 25:irBVEcCerxdYEm99J+i6JecrPxL1MhP6fawTtg3kBfFL1BqRintelaNIKQf+Htng0ONKNu9fWUOJsXW81eI1a48BVSoyVKkTz7uJj7RaiONlGYJHfvYLXm1t6KiOc26NuQDEocK/YpGf75pUZHOPfyIywAtOARaEX4yp5mspxqyvVBYCZU+E+8syoZf1BTiMDL0bNsGGKhyQ0DjljxlQsDxHHgm5ExwTNCwIKZEFxD+24/anQE6OWrL6AlcsJEe6RmKvRm8DjDy8mfaF2fr/3KBos1PJbNY9dEz20hdpkbQSqZ/m2tyE07k2H1Qp0goVEgPZzdnO7Se7jSbmjWHUGw==; 31:AagwyXipzl96WyXURd+Bbgp4KPironT1w6xvrB6BwGsu4LJNqJj7zyTb14EAp+dqxsyvm7Ft75wODyi1GU+AbVOxdaCammTgsitnXWxyavygPJKDQTSQDLAtbOtKoHtT3DzAnh/wDwGkMq0eOal50Ld+oUshmGOm/rkPjJim+S6BeDC9xEkWl5vgAMBlUMQkjCJrbEt0AR241tAIHfoJXUaAyPOrXTptt21rpdEopzk= X-MS-TrafficTypeDiagnostic: VI1PR0202MB2782: X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(3231254)(944501410)(52105095)(10201501046)(149027)(150027)(6041310)(2016111802025)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(6072148)(6043046)(201708071742011); SRVR:VI1PR0202MB2782; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 4:XGeN7xHpcRKSm8wZoSIqtJ0efYkzX+f5+wfuJ79apHd4I6enlHk4+Il91e6NFaqiiwvXpGW+XSu14q8KTEbxW2kcJUjC0/bGN6NEiHtZ3t+YwDD9bpsBm6RcDNNPlWSRbcYwqk6kB5rgGa+e6h2KFOl3faPnA8M/cEa6ioVJ6YVO12/OQoxvmYo9MNxylXECCdF6Iiyf834ANvuCkJz0LPzP0QpnlxKS+VXSu+mux6vWNCu2g+iLDWamepknkyKE5Bog1BBEzgKnk/TEtRLBow== X-Forefront-PRVS: 067270ECAF X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(39380400002)(396003)(376002)(39840400004)(346002)(189003)(199004)(48376002)(6116002)(97736004)(68736007)(478600001)(4326008)(5660300001)(1076002)(6666003)(2906002)(53936002)(16586007)(3846002)(66066001)(6916009)(316002)(15760500003)(47776003)(50466002)(54906003)(6486002)(50226002)(186003)(16526019)(476003)(81166006)(25786009)(6512007)(11346002)(446003)(105586002)(7736002)(956004)(106356001)(2616005)(6506007)(36756003)(76176011)(386003)(59450400001)(2351001)(305945005)(486006)(52116002)(51416003)(26005)(8676002)(81156014)(74482002)(86362001)(2361001)(8936002)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0202MB2782; H:orc.pedanet; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: axentia.se does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 23:jdWamBh9w8aa0/pHb9eoCcX3ntapvMnjUpXf6wUV07aSFRdp6Wl+PKYtp7r4cR5K42eUvKqEDBGUBqND7BOvb5AnC1MvkxDnwv5ZYknSXAM7cZ7F4ccCmc3dQnG/LOz33Q1cEqdEyR4QefoqvXlcdfj+/rUMCX7LdT78GEODjD/XOiQLzvu9sAH0/oe5HZtwBSH2oa0RvaQirJIWeD943q6fwfdZPzALLA2nyCT8IC9v3pEDNc4sb1HE3+rvPjpY6q/d4HZAxga5ctxJqtzIoXoSgB1RBgLP8wINNhTow1YaxipddKSlPlsx/9IJrVlICWZVoX+dQ/FRzYcW95ZTX1cnRcyb9r5TFD27aS9GjqWxajyGRGKWbVfcX66EMe/uJ8lH1Ac1gUrTUGYyZtyvHkE+QoJHjmrhlbUo88RxRnu3i2rxWHPFPXhP6+JD7AuazMySrB+1MbXkg8yYYVxrrETDm7sqBtAsY3m9vcZJ98AnSp4oaRlXLEe+oweyBvovk6tvgv9YbcI6MAQGOUIgVw9me1B0au8Gw7SKgpqrucuxxC2GtQpSt/mMNRr9Oo53fcs0348F5732p/kczF7smCpw/kxgR+unF9EOXodb9D/deiPde2ltNoITTu+29J1pcz88vmNK2AutXk6JRlQ0H2CQAqmrFpSXaxPuglo1YqaGya2MFhq8ms2cbxzD90/S6o5pKJWPPYi2JA2HLPooZ+OB6IXygjkL5sRC2/8LLpQGOekcegjPbMQyeDZmXjSCvy8NqQA9/WW2n4viid40bHravnUhGTv+uHxxsfqLpjTVRECuOt0fg7JCgxMN+Y/u1brHLE9ux8/OP7QkAu3RaKf84t36cerVrtLsMk0lxsxpqsyHQqEH7lcOMvbHCj25uMt1qc4asr+yMJhpgsvcx/HVQY5eevm5bDFc21WpZjej8Hbq5Cca7JMSdlvVZXL8v2AS1O3AXsHqV0efakl9i9RT+cBjaae3e2AcuOlzuGTdyfL4q1ctTKMcupEoPbPgTZortjZR6ssEgTaRYnVyEh4ahkpKkwsN4vcQYS54xSUhTeKd7m6EnkVX3agOdOIP5AMVMyBeF4Uyd3wL8wcUDVBsiTGGRDNbOpvsppG2RaSz6l/gSiEoGTsIFvM/4YKmxaeseJU2SzgvtLCYNfnafW/qj17pQnsKuGCQ5kwrBAnCMI4Xxp8/SE4YoTnSCWk2DGGlfXyTfOkAKuTtnfZVo3btU8t7e9qHliMiY1GSb0Map/ke3OTgVVU5Tpl3RAJ+mFwiReOndQCK8s49+Dbid0nV4Kuecuv634ddXrXSE0cASOyKtT9EXDXUCsMijsMT4s2mirwKuLtk6NseUw4Z0w== X-Microsoft-Antispam-Message-Info: TI5nxVEhk10vVj3GCHUzJQtYEqnqDyG9Cl66PN9H4KWdtej/wvCtgOUHB5xLkWbmzKZZCWyxABTYh2B+tq8RCT93Pwzmat9YWloRDTF7hsdDrX8PMiExdFKOncEtvnytN4O59G92lyNUNnLAZxGXVG9TU6wn6KrFKJRZT8HCyrLjQbMx1i1WTDo70KFb4c+X X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 6:dJtPxyrbPsPVEOBesvggic080/OrB96bW5WnFJELbsMtO3HQVQ6X2plMDyjU4DM+v4Dp74IKJwbGlqOFThtYafoZ3LgnSRVqcifGUvvCWUfvty1R7UC/DktltP0mT0Y2eNE+kI4sAvbdkkA5EyVQXQUbgSfCemHS2VU95+cOC5rky6GDyFvp2rAIPVLMMqj7Jch/dNeP2VpBTiagRSIRNqQGHOcXNfjqUIBxE5He66w+IeqAHr0wbA1At5TI0Qn748Oj++gZvf173EiC2WkT7D1q74XLg+7KrmtSQ9Wi0dJslLhwM5oxHVdOIAu3scPPK+QJ2nYSDoldzq5R+IwdnewsJk3qC4A4w+FoEpD8OiTqen1RS2fm1u83zjm0wC45ypAO3BlRrHSiwY4EM+wB422A7uZ8JsEKujPWovZVL+8Y+Fi1YudDHJMhhV+UamJkCjrXLK7PuNQkur7C8ap1hw==; 5:FcnrnfMTI9pSSGIPiuilrqxr4625RBk56K5LMKfR7V4e1C4uOYR/xv65opkPCVW0yQF/7tTxdjl5JzmNAtvPbxm9URNd3/8PUnCiff2A9Cehxc9bPjF/yxkH1ApRxg8A6OT8FAhPkrOkpyMQcJO+UlZ3a9NM6+J4wUXecOW2fBM=; 24:baSX0ZMNu8DxHE6bkAaCq8fHJqfdfBhAE4p3EB58LQVkwFFFMnMHNKeB0pBwHCsUoi2Jkw7v9poNdaA8RP3QjpFeyJopji4gGo7/u1O7cSw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 7:LFkiOjtT5dkcii02T5CtF3MD5bMNatK/8kLdNkoHkjKgETrMDIyaT0RfYNvsGhDHDorn9TB/IazDBir5RfTbrfYZWqh0U3qf73FE8CSWuGZWiU0ti60jSmmkURc08A5bH3TiJyszoiTtFm/Oe8vZ3xZsYHhNoZwbFQr6K0dPUBX+HBFwFyj2dVnjAxN4cmyg9tzETvtQJNkXEz9ylLkrOrSUXeC7E395GH6eVvog/gKm2pvFD6Fi/Es5PeFFm26N X-MS-Office365-Filtering-Correlation-Id: 632a5342-2842-480f-81f1-08d5b9aaab94 X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 May 2018 14:55:01.2164 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 632a5342-2842-480f-81f1-08d5b9aaab94 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4ee68585-03e1-4785-942a-df9c1871a234 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0202MB2782 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Because it looks neater. Also restructure debug output for resends, since that code as a result is only handling debug output. Signed-off-by: Peter Rosin Acked-by: Linus Walleij --- drivers/i2c/busses/i2c-stu300.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/drivers/i2c/busses/i2c-stu300.c b/drivers/i2c/busses/i2c-stu300.c index dc63236b45b2..e866c481bfc3 100644 --- a/drivers/i2c/busses/i2c-stu300.c +++ b/drivers/i2c/busses/i2c-stu300.c @@ -602,20 +602,24 @@ static int stu300_send_address(struct stu300_dev *dev, u32 val; int ret; - if (msg->flags & I2C_M_TEN) + if (msg->flags & I2C_M_TEN) { /* This is probably how 10 bit addresses look */ val = (0xf0 | (((u32) msg->addr & 0x300) >> 7)) & I2C_DR_D_MASK; - else - val = ((msg->addr << 1) & I2C_DR_D_MASK); + if (msg->flags & I2C_M_RD) + /* This is the direction bit */ + val |= 0x01; + } else { + val = i2c_8bit_addr_from_msg(msg); + } - if (msg->flags & I2C_M_RD) { - /* This is the direction bit */ - val |= 0x01; - if (resend) + if (resend) { + if (msg->flags & I2C_M_RD) dev_dbg(&dev->pdev->dev, "read resend\n"); - } else if (resend) - dev_dbg(&dev->pdev->dev, "write resend\n"); + else + dev_dbg(&dev->pdev->dev, "write resend\n"); + } + stu300_wr8(val, dev->virtbase + I2C_DR); /* For 10bit addressing, await 10bit request (EVENT 9) */ From patchwork Mon May 14 14:53:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Rosin X-Patchwork-Id: 912995 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=axentia.se Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=axentia.se header.i=@axentia.se header.b="qik0p949"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40l3f00ycFz9s16 for ; Tue, 15 May 2018 00:55:20 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932574AbeENOzJ (ORCPT ); Mon, 14 May 2018 10:55:09 -0400 Received: from mail-eopbgr20105.outbound.protection.outlook.com ([40.107.2.105]:36480 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932507AbeENOzG (ORCPT ); Mon, 14 May 2018 10:55:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axentia.se; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=ofIUKdGJb3BvlxQ07xHrr5CyLCszMM+taH7BDbx+krc=; b=qik0p949yfjN4mT+s3GBTgaTEkEnmdUv2HA/u4ohK3tdkLGx3oj7z2WRSC6c0beNW+oVy2EwgTTxrhkzVU+aWgCkvoIfX3wcBfChNRy2tdV8ltC/0Cj0tVVc56JszS1vBhAFCwXeYKj5GIqGxeF0i9IKM0FUQVrAyng6ZRbv+fI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peda@axentia.se; Received: from orc.pedanet (85.226.244.23) by VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.755.16; Mon, 14 May 2018 14:55:04 +0000 From: Peter Rosin To: linux-kernel@vger.kernel.org Cc: Peter Rosin , linux-i2c@vger.kernel.org, Wolfram Sang Subject: [PATCH 21/21] i2c: xiic: make use of i2c_8bit_addr_from_msg Date: Mon, 14 May 2018 16:53:30 +0200 Message-Id: <20180514145330.4857-22-peda@axentia.se> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180514145330.4857-1-peda@axentia.se> References: <20180514145330.4857-1-peda@axentia.se> MIME-Version: 1.0 X-Originating-IP: [85.226.244.23] X-ClientProxiedBy: HE1PR08CA0043.eurprd08.prod.outlook.com (2603:10a6:7:2a::14) To VI1PR0202MB2782.eurprd02.prod.outlook.com (2603:10a6:800:db::7) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(7021125)(5600026)(4534165)(7022125)(4603075)(4627221)(201702281549075)(7048125)(7024125)(7027125)(7028125)(7023125)(2017052603328)(7153060)(7193020); SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 3:GSfZJ5mYT1kyPk4PG2aDkHobtIevaoQOB3lAIQ+fpRqxD+6mUW5FphiOg+9cNiktIvDNdXWJ9qbrTslPlxze/Pmjgt6ewBvBT2i9LJucbxMKAuRSwEpWZo9uj99hJSgvHbObYLwRHpkVkTahA2LVEuZ9qEBBnNfTsU/QVYURB5v9YdYFGy2VJgm8/dBp1SlJNtEner4g5yx66J2q7jWrG6qqnv3dNBokgC4UazxCPZXrpRbHRQIYmJLd0eVKRnMX; 25:SQR4ZJ6qkmEHq+i1caynMQh/KwBl4BbdU4Vz0Va9QwH2I8qR3kT2PJXkuHLrSeivsrwnvdg415d72LoyKc9Ww9i4mKUHXexIMiISfe8zfMMIH13MjQk/caanzIXznNUGQuOuSwQhIQjy9A2625AVywzDvJKLjMRHYU3SzCcY3Nh79HC74hbgA9ezJ3ii7JAHFTL6IY8Wmb90Zf6eZzLae0KIYkCx9VxUTBgJZmlK5SXI7lbROiS8AHiEWqyodpYQzral7MP6RAy08sV/v4aMeDwOif58ylTssY0jwtNGAKfPE5Z39WSmH+/gh9JSx9iq4iow3eCPBt9O1fv6So0gWg==; 31:4mCYCVjz3RyLJgRzS2yDe6g6kS54neCeE1RcQrUfZW+oUICl4HQlWRdZzMC7PmkeJQWXc08pIppB/b/I2Tm5AhPtd0ypu3QR7FVeL4oy2UEuBLp6Vh/5wWxxS6BWWOLysedUd7n/Jl3QyoreKFhUBwqjDZQkYCDP1o4jc21wMqH2Vq+E8uJEUCev6GKwRQhruA/iTk2cnd2vW+O4X+nKHeav+xRIL61MRz2kjVGHvOM= X-MS-TrafficTypeDiagnostic: VI1PR0202MB2782: X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(3231254)(944501410)(52105095)(10201501046)(149027)(150027)(6041310)(2016111802025)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(6072148)(6043046)(201708071742011); SRVR:VI1PR0202MB2782; BCL:0; PCL:0; RULEID:; SRVR:VI1PR0202MB2782; X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 4:lnIoiM1ntQFuJsRHYKXV2R7RH3kV6YJTLImGgSvDhUG5oaQKIhPjO3Pybl8UsyNFbiDraqUPECrlUkWLmFbaTPX0HNynUYd2QqbsLUBlGJI3Nsa1ZKCC85wbcxUQRw2n6ZrxaCUAR/YVzHAZXMk4IyJ29uXh1mka1r3TGZqYTb8j1OhJAl3ZXr3bnXMd8Q7/fuit/ImVlCvJ9qd8LDlw8k3rX4KIezXQaxXWKdAdYdK/6S4s8pEoHFGFy8J+1Zqtym7OLsRouwhDgKTIlDvWsg== X-Forefront-PRVS: 067270ECAF X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(366004)(39380400002)(396003)(376002)(39840400004)(346002)(189003)(199004)(48376002)(6116002)(97736004)(68736007)(478600001)(4326008)(5660300001)(1076002)(6666003)(2906002)(53936002)(16586007)(3846002)(66066001)(6916009)(316002)(15760500003)(47776003)(50466002)(54906003)(6486002)(50226002)(186003)(16526019)(476003)(81166006)(25786009)(6512007)(11346002)(446003)(105586002)(7736002)(956004)(106356001)(2616005)(6506007)(36756003)(76176011)(386003)(2351001)(305945005)(486006)(52116002)(51416003)(26005)(8676002)(81156014)(74482002)(86362001)(2361001)(8936002)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0202MB2782; H:orc.pedanet; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: axentia.se does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 23:Vhmq+xHAtP7x/whOhKBIhagqkZ+8tN879aww9rnwLu4YezXgLn3W7BrcYidSfCurNdj5Tb9P84qB+VC1+7b1Gic/PafyJyd44NK8ldwwEyXV0GAZK2edeGSjouerjQa3YlYMu0PQE3CLCi930zeUjTRNuM4UZbPCdeXPOoh7fAOOayF1JD2JLNCu9XlSJ6mddU19fsK83ynh5GadjE0I7WnV6/cEero9fAubTC6DmvLHnfieiQyeKkZmv6SINL4N8Yx4OxwciY3o/OghqZr4hcWbJWJyPEFuPh3wj6huStYuodvkxjOsU12VA6WOYefl8ac1qWiL3y1AfhLPUGEzT7PX0VcPRfX0zTGFgbAD/xJUjvtjO3cVswI0GbpbDwS9iRZdk9i/i8cAYoroqXFNdYtUrcMm6BpS31cRjSVOQyHATEzbKWqn1vJ/nVD2UA3ZrbXtwewR9XUNl5HFbCySzbYUXaNxlrv0PYSc2/K/4zijaF6go3dt77R6+AAyoVKsSWV+iEA8Daro7p6THDM2OpfJDSrlJVBLBVU/kvMM3U24xcKkjCo/spDZ5RGPb0x657S3ea9c4MELgdaV9rN6u4LzYGjOT5hupocGCICJyOcoJev9o/m1AYl+WJByDzHYdPCXD1kUfHcUQ0ZWafyns0auzkKQ39YX/JXQ34fvYKpbr05LExMPf4McMSLzC9BufyDFr3wZBNPg8KQ/EgAQ6SV1uxiAfdSOoqZ/oo8OofzOkFAiIjYxcYXzflfXJGrUIHeL6iU3GQ34VudYC75b26Ie6M88fxUDfWnI+pgFlF8KnpVumGa9eQ44UBNduj8OMw3214sUfHySzbm47u4lDvcP0KyL58jC+FQ/p381nzLY37f92/YpuAJIwLMBncBjmQ2AJICtUUQl5+o+s4cr5S9XiftlfAvuiWWy5C5euNsP2zeJcUuwxEdsuar7URmU7tBf7SStPOeyJ4E/1ykRi7sxW+ayAX5+1MXynHlauJMM9AEcxNgKiOYz+PIb6UbPbkgBoNhjbTecUKCKPsn2qUjVA5SKlIufB+iHLS5dlgEZKHPvc6GC0MRsK5uBgPCtddrv2aR70c07pRfgtXzcMmemYPkoQiu9CFeZcebRIVrz8rragBF+wofXiSJ3lR4JAovjEnfaa5KJD5Dsuxh2xlWuDBTVcxuw4ie10pHoImsJTL8BkOQu9w8vlurR0KgWhLmed5RfKo7NNBUOB5/U77KDr9lBrY1gsy/Fzc6ZHuC6F8XrJ2jcoRWSnbeyaBcR90+8wXwp5RwxTLnjYaHUl9KFySwOKNSjicMumlhnesAJgjW1ptQ/H4dosWmQbiCm X-Microsoft-Antispam-Message-Info: XWhAlEbtVTdIoFVDQ2xHwEdf/BDTnlxST9DGGVwQjogFpuetezJMpaC+rDYEc6zs9z5eiYGLZZkhjNJJKAM2spYmB6dhKIMb1rzoBGYzb2M+Tr3WQSrlBBL8edvyIGG3iEASKoMHh5HISBiu185gHo33tkmY33tqCpK5ZGbxeaafX4MHjc7pKdz1j7MOzJzd X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 6:8HnGeTE0WIh3ADI64Drc3sFATiTLsn3ZO9DNiouesKgQrWET2As5MH6Ss6jTKCX3X0LvefNkznLaVrU39+f5YoWRMyOJYi8IXQjs6NvgBH2u8duiXoCMrFC+UfjxcoirQ5QR/vQwxYjuzOZwwAquEnamSi0krXvnzRkSQyNNT4B/oIoNj1KylEJ2VYQ71u0pkXDo69rVa0xi/puundSAogRcoCir8GC2R69pHCuGSfqO6UBy3pSpyPyW7IwwTnbErClmSDZYig9yuY5/en3io24LaVjp5bWQGqDP8RNNkBO8qUhUdgi6QSYPrGQJhYcWstTcMmVPoNZ/Gt0KObaDVkib4zaQCtdF9c+/lD1cT7AfHZ0y2ZVxkmZN382UJAKxCvJJDxDoHZXO9uHDHjYTGCwMt9M3wryhhfzzCIZ03oHP7cvIJf5DXYoIAO8GjQO8hIMJJnps1nxUXvDe7415MA==; 5:3mIpHkMcc+gThY3zyoJU3uHA5JO7RhmKR6SQYaZo6av8IbkoT01Ro5KoeshBiTBwYCegmpyfNSnak9NEccWStasJz526FrWUF8LgeKyE0xecz/eMT4vpQfql8mlnxi9dWa25LzJ83GyR+S/h0JHLnDGclhIPT2dzcZvxJ1e+h5I=; 24:IT4IeO9sZVAusUFujoYeSmFI2un1EEIjtPa55gPQavRCfldj3haUKYlVvHZHExidoPK0U9mi7HJMtjpZCGO62ViK4FHNBlGC1EcUhAzD2cE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR0202MB2782; 7:X/m/5we67wjom0J08mWzMKOyLYmGnwWd4VbYXlT9IJqbzUGvp2P0F/C26nSsbZAANV4TZYcrEWemYwo/K6+jTyKCtBzVGnTn/HS5ZfvTjSyvTvucqyjvu358WMZeibCrGVWbB9dyHZsU8uOE4SON6VLaHka5lhHXQ4QRn37cq26vnb0ukxrnZjZGI5DLJv1uSf+1SbOZEEYJCIIx760kxgI7aDz0ykQeuDjjkqEvdMeAfNqQvQIwX4vk5igBJ1Lo X-MS-Office365-Filtering-Correlation-Id: d450c387-d1dd-4271-944a-08d5b9aaad6c X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 May 2018 14:55:04.4196 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d450c387-d1dd-4271-944a-08d5b9aaad6c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4ee68585-03e1-4785-942a-df9c1871a234 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0202MB2782 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Because it looks neater. Signed-off-by: Peter Rosin --- drivers/i2c/busses/i2c-xiic.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c index c80527816ad0..1818c3b5c8d7 100644 --- a/drivers/i2c/busses/i2c-xiic.c +++ b/drivers/i2c/busses/i2c-xiic.c @@ -143,12 +143,6 @@ struct xiic_i2c { #define XIIC_TX_RX_INTERRUPTS (XIIC_INTR_RX_FULL_MASK | XIIC_TX_INTERRUPTS) -/* The following constants are used with the following macros to specify the - * operation, a read or write operation. - */ -#define XIIC_READ_OPERATION 1 -#define XIIC_WRITE_OPERATION 0 - /* * Tx Fifo upper bit masks. */ @@ -556,8 +550,7 @@ static void xiic_start_recv(struct xiic_i2c *i2c) if (!(msg->flags & I2C_M_NOSTART)) /* write the address */ xiic_setreg16(i2c, XIIC_DTR_REG_OFFSET, - (msg->addr << 1) | XIIC_READ_OPERATION | - XIIC_TX_DYN_START_MASK); + i2c_8bit_addr_from_msg(msg) | XIIC_TX_DYN_START_MASK); xiic_irq_clr_en(i2c, XIIC_INTR_BNB_MASK); @@ -585,7 +578,7 @@ static void xiic_start_send(struct xiic_i2c *i2c) if (!(msg->flags & I2C_M_NOSTART)) { /* write the address */ - u16 data = ((msg->addr << 1) & 0xfe) | XIIC_WRITE_OPERATION | + u16 data = i2c_8bit_addr_from_msg(msg) | XIIC_TX_DYN_START_MASK; if ((i2c->nmsgs == 1) && msg->len == 0) /* no data and last message -> add STOP */