Received: by 10.213.65.68 with SMTP id h4csp410018imn; Tue, 20 Mar 2018 06:21:51 -0700 (PDT) X-Google-Smtp-Source: AG47ELuo+zKU385FjJ79/20xuMjSNwY4WHz9QKSV029/qT2h4AMrdTKOD7bG18C0t3VpJTjjeveq X-Received: by 10.98.238.2 with SMTP id e2mr13720808pfi.68.1521552111459; Tue, 20 Mar 2018 06:21:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521552111; cv=none; d=google.com; s=arc-20160816; b=LLA+iqlfWcpNbrWI120f5GhYcau5syIxD5epD1H1IgNGKGL1CeXKXmi5CNRFzKh8wv 75VM3TVBWrBUX9E18L2joI4bVeynRc92IoK0RsdGhv90WvvQBReGPhMaQfDX/yIl7ibV kx9LVO5DE8sNdcR3eJ9xI871YaWEWb8ECPsN+kGzgseZ8HfCfLLLCWjQdglhu0JQtn8s cEhckfvSnWA9uBta1wLKH/RmxtOjwasZroodZ5aNjsvh+4PmRBih7ZpqIjUT+3PRHssO 9asicYeLkHGYcsicacU/pTeKSEre2teE0ZcSOfJKH78lVebzpojSKJhKVubN6sLevJtD YiDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject:dkim-signature :arc-authentication-results; bh=/YeKM74+lmRarHBFXmq1Y9hPi8B9RKPLwgZUm9VNie8=; b=zq1wQx54tIF6OemuU8FawulX4Nl1NKbP56EJk5ab+/3LT2aj1ymPSbUjhRtmRVz27t Y/K2f+xEg7xYKmi+GLAjQOxqT3+rYfUjEeCVUDLc9NIo8fv4nB1hrQsPB0CZAFe/3/Ts QIqAzVbAlB5I3DR9iaAVaG78be7bZ0EsFYf27AlfLdUM2taTMp1Xa5KBI+fsYGF6mUXk 6fRp3buqkuXvmpZ0e9DAavFELfnZihJw2VoiCihaiSSKD/cl75Gk6OsqCDf1TuaJ3A6n Bv8bR4n4SjwhQ63902M/5bR9C2DWrK5gH60Nl2rBu4eKMnX0Jz4iVeGoRREltTt4MJVV LPBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=Ncmpbh8H; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o5si1177915pgp.16.2018.03.20.06.21.36; Tue, 20 Mar 2018 06:21:51 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=Ncmpbh8H; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753469AbeCTNUn (ORCPT + 99 others); Tue, 20 Mar 2018 09:20:43 -0400 Received: from mail-pg0-f67.google.com ([74.125.83.67]:46872 "EHLO mail-pg0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753019AbeCTNUk (ORCPT ); Tue, 20 Mar 2018 09:20:40 -0400 Received: by mail-pg0-f67.google.com with SMTP id g8so595056pgq.13; Tue, 20 Mar 2018 06:20:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=/YeKM74+lmRarHBFXmq1Y9hPi8B9RKPLwgZUm9VNie8=; b=Ncmpbh8HX1rx5tA5EsMLpkNfa8P0nRDalsSasd0wybQg8L/TWkiWjWYsiyFxS0nFhT lUV8I57T6o5zxf6LAhrAAoy04OAwiONqKho9pQ7pBaG3C58TQfsU+D83+UJoNnsKKnN1 PxO0YRDnVsxIbs0OzL6MTWTTbvFGVgbRh+6fRLEHjrFlRQAsfUUSu4MyxTxXO2b8CqUm cqQR6xwZY1wGs0mH7k/ulZyJvMkgmRPlV7NtATiY5w1pO71umyeykCWVQqs3zV+eia3a GvK1oZ0WSyqLLX6utAozfqlYAdnJ0wwX2JN6IJodDe5fzSzbxjg/JvCe+HVE6t9GegOv Fyug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:cc:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=/YeKM74+lmRarHBFXmq1Y9hPi8B9RKPLwgZUm9VNie8=; b=pJOeMHAeRvTsBn5JjrQPyBEllQDHcOq3z21HXIjsxXNDr039J7REt/RLBhGtscIAH8 o963dvJ4XNE6Vo0rNGENssCL+GYwLtAc9ZWxfxsA4Pr0xwaQfxNLEWo0+MQdkTMgPAS0 U3C72cl99mKa6q1y1ZcoQQlRDEPuEvIfeg9CHZ57EJm0IKMPGKbhVzLMVsWF0ui1WgjB qZsQdf2WoiIwXMzC4I/5Wace1GoHaCbBPUmagcmtFv+ZYCy+DwcDCQA5NR028U+XVWUt XLrN97B76FMK3N4DpGNmSLY0xeh7JJZQs5IaP7yxjfZWOBCjFqKq+t7epAtTPVspquTd 1qXw== X-Gm-Message-State: AElRT7ET7B97X6Ji5FnkdGoN4DQpgnq61oXnNsfJvSMAmazRYi9PhYt8 nROwJnmhPuMce0vPdscpMF4FDQ== X-Received: by 10.99.174.67 with SMTP id e3mr11729391pgp.139.1521552039654; Tue, 20 Mar 2018 06:20:39 -0700 (PDT) Received: from server.roeck-us.net (108-223-40-66.lightspeed.sntcca.sbcglobal.net. [108.223.40.66]) by smtp.gmail.com with ESMTPSA id q6sm3268578pga.37.2018.03.20.06.20.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Mar 2018 06:20:39 -0700 (PDT) Subject: Re: [PATCH 2/3] i2c: mux: pca9541: namespace cleanup To: Peter Rosin , linux-kernel@vger.kernel.org Cc: Wolfram Sang , Ken Chen , joel@jms.id.au, linux-i2c@vger.kernel.org References: <20180320061909.5775-1-chen.kenyy@inventec.com> <20180320093200.19179-1-peda@axentia.se> <20180320093200.19179-3-peda@axentia.se> From: Guenter Roeck Message-ID: Date: Tue, 20 Mar 2018 06:20:37 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <20180320093200.19179-3-peda@axentia.se> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 03/20/2018 02:31 AM, Peter Rosin wrote: > In preparation for PCA9641 support, convert the mybus and busoff macros > to functions, and in the process prefix them with pca9541_. Also prefix > remaining chip specific macros with PCA9541_. > > Signed-off-by: Peter Rosin > --- > drivers/i2c/muxes/i2c-mux-pca9541.c | 26 +++++++++++++++++++------- > 1 file changed, 19 insertions(+), 7 deletions(-) > > diff --git a/drivers/i2c/muxes/i2c-mux-pca9541.c b/drivers/i2c/muxes/i2c-mux-pca9541.c > index ad168125d23d..47685eb4e0e9 100644 > --- a/drivers/i2c/muxes/i2c-mux-pca9541.c > +++ b/drivers/i2c/muxes/i2c-mux-pca9541.c > @@ -59,10 +59,8 @@ > #define PCA9541_ISTAT_MYTEST BIT(6) > #define PCA9541_ISTAT_NMYTEST BIT(7) > > -#define BUSON (PCA9541_CTL_BUSON | PCA9541_CTL_NBUSON) > -#define MYBUS (PCA9541_CTL_MYBUS | PCA9541_CTL_NMYBUS) > -#define mybus(x) (!((x) & MYBUS) || ((x) & MYBUS) == MYBUS) > -#define busoff(x) (!((x) & BUSON) || ((x) & BUSON) == BUSON) > +#define PCA9541_BUSON (PCA9541_CTL_BUSON | PCA9541_CTL_NBUSON) > +#define PCA9541_MYBUS (PCA9541_CTL_MYBUS | PCA9541_CTL_NMYBUS) > > /* arbitration timeouts, in jiffies */ > #define ARB_TIMEOUT (HZ / 8) /* 125 ms until forcing bus ownership */ > @@ -93,6 +91,20 @@ static const struct of_device_id pca9541_of_match[] = { > MODULE_DEVICE_TABLE(of, pca9541_of_match); > #endif > > +static int pca9541_mybus(int ctl) bool ? > +{ > + if (!(ctl & PCA9541_MYBUS)) > + return 1; true ? > + return (ctl & PCA9541_MYBUS) == PCA9541_MYBUS; > +} > + > +static int pca9541_busoff(int ctl) bool ? > +{ > + if (!(ctl & PCA9541_BUSON)) > + return 1; true ? > + return (ctl & PCA9541_BUSON) == PCA9541_BUSON; > +} > + > /* > * Write to chip register. Don't use i2c_transfer()/i2c_smbus_xfer() > * as they will try to lock the adapter a second time. > @@ -181,7 +193,7 @@ static void pca9541_release_bus(struct i2c_client *client) > int reg; > > reg = pca9541_reg_read(client, PCA9541_CONTROL); > - if (reg >= 0 && !busoff(reg) && mybus(reg)) > + if (reg >= 0 && !pca9541_busoff(reg) && pca9541_mybus(reg)) > pca9541_reg_write(client, PCA9541_CONTROL, > (reg & PCA9541_CTL_NBUSON) >> 1); > } > @@ -233,7 +245,7 @@ static int pca9541_arbitrate(struct i2c_client *client) > if (reg < 0) > return reg; > > - if (busoff(reg)) { > + if (pca9541_busoff(reg)) { > int istat; > /* > * Bus is off. Request ownership or turn it on unless > @@ -258,7 +270,7 @@ static int pca9541_arbitrate(struct i2c_client *client) > */ > data->select_timeout = SELECT_DELAY_LONG * 2; > } > - } else if (mybus(reg)) { > + } else if (pca9541_mybus(reg)) { > /* > * Bus is on, and we own it. We are done with acquisition. > * Reset NTESTON and BUSINIT, then return success. >