From patchwork Wed Feb 13 18:02:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 220224 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id EA2FE2C0295 for ; Thu, 14 Feb 2013 05:14:04 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964874Ab3BMSNV (ORCPT ); Wed, 13 Feb 2013 13:13:21 -0500 Received: from mail-qe0-f74.google.com ([209.85.128.74]:64483 "EHLO mail-qe0-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965118Ab3BMSCc (ORCPT ); Wed, 13 Feb 2013 13:02:32 -0500 X-Greylist: delayed 148454 seconds by postgrey-1.27 at vger.kernel.org; Wed, 13 Feb 2013 13:02:32 EST Received: by mail-qe0-f74.google.com with SMTP id a11so147529qen.3 for ; Wed, 13 Feb 2013 10:02:31 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=pdUN1E5AZ8mj/k1qcjhxgQD0RgAVrlAP2YI2ammlcwU=; b=b0/OtY113vJbbdTpLz221os1QKWegfJylfHZ0pLpQWgImzW8lohAtZz/zffGZsXr+O aANHq+anaRnTd99hM+ntqDTGUlWF5vfUrHx7GNVhevqCAPyXkcyTSoyjAnDddHqulKmt OnkofOpqfk3zxZiHuIko9h16n2rgYWxyW4gVamStv0T7LyroYMTPvkIVTj5TTEyVZm3E pH5Fp/b1vvdd5vok1kNIdy0Sq2ZrkVvqkcw0r0IBK1vxGFRQ/RhVf/Kd8uimCOOwz0DR +rpXv8Kbd2xYVnr9epEXomXE58LZ1FfC/gGmUZttVESm3K1tGakpHRU+jQc4UIgcNesP oEzQ== X-Received: by 10.236.170.132 with SMTP id p4mr10015232yhl.26.1360778550920; Wed, 13 Feb 2013 10:02:30 -0800 (PST) Received: from corp2gmr1-1.hot.corp.google.com (corp2gmr1-1.hot.corp.google.com [172.24.189.92]) by gmr-mx.google.com with ESMTPS id e7si2010173yhk.3.2013.02.13.10.02.30 (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Wed, 13 Feb 2013 10:02:30 -0800 (PST) Received: from tictac.mtv.corp.google.com (tictac.mtv.corp.google.com [172.22.73.80]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id A64A431C2C9; Wed, 13 Feb 2013 10:02:30 -0800 (PST) Received: by tictac.mtv.corp.google.com (Postfix, from userid 121310) id 56B4D80EE6; Wed, 13 Feb 2013 10:02:30 -0800 (PST) From: Doug Anderson To: Wolfram Sang Cc: Simon Glass , Naveen Krishna Chatradhi , Grant Likely , Yuvaraj Kumar , Ben Dooks , u.kleine-koenig@pengutronix.de, Mark Brown , Girish Shivananjappa , bhushan.r@samsung.com, sreekumar.c@samsung.com, Prashanth G , Olof Johansson , Daniel Kurtz , Grant Grundler , Doug Anderson , "Ben Dooks (embedded platforms)" , Peter Korsgaard , Guenter Roeck , Jean Delvare , David Daney , Axel Lin , Stephen Warren , Barry Song , Guan Xuetao , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 4/4] i2c-mux: i2c_add_mux_adapter() should use -1 for auto bus num Date: Wed, 13 Feb 2013 10:02:12 -0800 Message-Id: <1360778532-7480-4-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 1.8.1 In-Reply-To: <1360778532-7480-1-git-send-email-dianders@chromium.org> References: <1360778532-7480-1-git-send-email-dianders@chromium.org> X-Gm-Message-State: ALoCoQnNZ9G4KAyFR1mfUk7nd9JhZln6QyaTxXQ7EQNOZkE+QooFYMnpZ+1n2iZ1mFUyeQP2xnfmfkzbGkno9KA/5vhHiJl9s9tnlM8oqCGVhjR5i+g9FsrRCXEPaiDgqi95hXH6yQRrsuxrieyrkxVHITfQ3krA9wRbBaj7hwAhbOImGe9SxvPr6AuOacOLxbO7sAJ6n+qXkAMEK4Hcd0vpgfxjRkhdIw== Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org The force_nr parameter to i2c_add_mux_adapter() uses 0 to signify that we don't want to force the bus number of the adapter. This is non-ideal because: * 0 is actually a valid bus number to request * i2c_add_numbered_adapter() (which i2c_add_mux_adapter() calls) uses -1 to mean the same thing. That means extra logic in i2c_add_mux_adapter(). Fix i2c_add_mux_adapter() to use -1 and update all mux drivers accordingly. Signed-off-by: Doug Anderson --- Notes: - If there's a good reason that force_nr uses 0 for auto then feel free to drop this patch. I've place it at the end of the series to make it easy to just drop it. drivers/i2c/i2c-mux.c | 10 +++------- drivers/i2c/muxes/i2c-arbitrator.c | 2 +- drivers/i2c/muxes/i2c-mux-gpio.c | 2 +- drivers/i2c/muxes/i2c-mux-pca9541.c | 2 +- drivers/i2c/muxes/i2c-mux-pca954x.c | 2 +- drivers/i2c/muxes/i2c-mux-pinctrl.c | 4 ++-- include/linux/i2c-mux.h | 2 +- 7 files changed, 10 insertions(+), 14 deletions(-) diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c index d94e0ce..8ad1a56 100644 --- a/drivers/i2c/i2c-mux.c +++ b/drivers/i2c/i2c-mux.c @@ -103,7 +103,7 @@ static unsigned int i2c_mux_parent_classes(struct i2c_adapter *parent) struct i2c_adapter *i2c_add_mux_adapter(struct i2c_adapter *parent, struct device *mux_dev, - void *mux_priv, u32 force_nr, u32 chan_id, + void *mux_priv, int force_nr, u32 chan_id, unsigned int class, int (*select) (struct i2c_adapter *, void *, u32), @@ -168,12 +168,8 @@ struct i2c_adapter *i2c_add_mux_adapter(struct i2c_adapter *parent, } } - if (force_nr) { - priv->adap.nr = force_nr; - ret = i2c_add_numbered_adapter(&priv->adap); - } else { - ret = i2c_add_adapter(&priv->adap); - } + priv->adap.nr = force_nr; + ret = i2c_add_numbered_adapter(&priv->adap); if (ret < 0) { dev_err(&parent->dev, "failed to add mux-adapter (error=%d)\n", diff --git a/drivers/i2c/muxes/i2c-arbitrator.c b/drivers/i2c/muxes/i2c-arbitrator.c index c3bbdf7..89d0d06 100644 --- a/drivers/i2c/muxes/i2c-arbitrator.c +++ b/drivers/i2c/muxes/i2c-arbitrator.c @@ -173,7 +173,7 @@ static int i2c_arbitrator_probe(struct platform_device *pdev) arb->wait_free_us = 50000; /* Actually add the mux adapter */ - arb->child = i2c_add_mux_adapter(arb->parent, &pdev->dev, arb, 0, 0, 0, + arb->child = i2c_add_mux_adapter(arb->parent, &pdev->dev, arb, -1, 0, 0, i2c_arbitrator_select, i2c_arbitrator_deselect); if (WARN_ON(!arb->child)) { diff --git a/drivers/i2c/muxes/i2c-mux-gpio.c b/drivers/i2c/muxes/i2c-mux-gpio.c index 9f50ef0..301ed0b 100644 --- a/drivers/i2c/muxes/i2c-mux-gpio.c +++ b/drivers/i2c/muxes/i2c-mux-gpio.c @@ -208,7 +208,7 @@ static int i2c_mux_gpio_probe(struct platform_device *pdev) } for (i = 0; i < mux->data.n_values; i++) { - u32 nr = mux->data.base_nr ? (mux->data.base_nr + i) : 0; + int nr = mux->data.base_nr ? (mux->data.base_nr + i) : -1; unsigned int class = mux->data.classes ? mux->data.classes[i] : 0; mux->adap[i] = i2c_add_mux_adapter(parent, &pdev->dev, mux, nr, diff --git a/drivers/i2c/muxes/i2c-mux-pca9541.c b/drivers/i2c/muxes/i2c-mux-pca9541.c index f3b8f9a..a58b3c2 100644 --- a/drivers/i2c/muxes/i2c-mux-pca9541.c +++ b/drivers/i2c/muxes/i2c-mux-pca9541.c @@ -350,7 +350,7 @@ static int pca9541_probe(struct i2c_client *client, /* Create mux adapter */ - force = 0; + force = -1; if (pdata) force = pdata->modes[0].adap_id; data->mux_adap = i2c_add_mux_adapter(adap, &client->dev, client, diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c index 8e43872..4663ce6 100644 --- a/drivers/i2c/muxes/i2c-mux-pca954x.c +++ b/drivers/i2c/muxes/i2c-mux-pca954x.c @@ -215,7 +215,7 @@ static int pca954x_probe(struct i2c_client *client, /* Now create an adapter for each channel */ for (num = 0; num < chips[data->type].nchans; num++) { - force = 0; /* dynamic adap number */ + force = -1; /* dynamic adap number */ class = 0; /* no class by default */ if (pdata) { if (num < pdata->num_modes) { diff --git a/drivers/i2c/muxes/i2c-mux-pinctrl.c b/drivers/i2c/muxes/i2c-mux-pinctrl.c index a43c0ce..401ff5d 100644 --- a/drivers/i2c/muxes/i2c-mux-pinctrl.c +++ b/drivers/i2c/muxes/i2c-mux-pinctrl.c @@ -217,8 +217,8 @@ static int i2c_mux_pinctrl_probe(struct platform_device *pdev) } for (i = 0; i < mux->pdata->bus_count; i++) { - u32 bus = mux->pdata->base_bus_num ? - (mux->pdata->base_bus_num + i) : 0; + int bus = mux->pdata->base_bus_num ? + (mux->pdata->base_bus_num + i) : -1; mux->busses[i] = i2c_add_mux_adapter(mux->parent, &pdev->dev, mux, bus, i, 0, diff --git a/include/linux/i2c-mux.h b/include/linux/i2c-mux.h index 40cb05a..a7bfb55 100644 --- a/include/linux/i2c-mux.h +++ b/include/linux/i2c-mux.h @@ -35,7 +35,7 @@ */ struct i2c_adapter *i2c_add_mux_adapter(struct i2c_adapter *parent, struct device *mux_dev, - void *mux_priv, u32 force_nr, u32 chan_id, + void *mux_priv, int force_nr, u32 chan_id, unsigned int class, int (*select) (struct i2c_adapter *, void *mux_dev, u32 chan_id),