From patchwork Mon Oct 21 03:26:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benson Leung X-Patchwork-Id: 285104 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 5BB972C0370 for ; Mon, 21 Oct 2013 14:27:40 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752626Ab3JUD1U (ORCPT ); Sun, 20 Oct 2013 23:27:20 -0400 Received: from mail-pd0-f181.google.com ([209.85.192.181]:47947 "EHLO mail-pd0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752602Ab3JUD1T (ORCPT ); Sun, 20 Oct 2013 23:27:19 -0400 Received: by mail-pd0-f181.google.com with SMTP id y13so7672129pdi.26 for ; Sun, 20 Oct 2013 20:27:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=W5sCerlbRaIwDhkx/jtw23b73kbG4pxNPZRtFF82VHY=; b=dUNlNJpPHQixPg18sMCl3t6NK/vVZG5wJ/hX4uX/o6k3f1Snqu5o3zC+0TGJR/+nIn vW6AuClB3ziKtEXR5alpu5M7YLELJWadUc1pY7xH5JwTQMWSGbWvKcPA8uxQtrwn79LS rwCN377gAfKJLvjYH8+7HPN+ksCYvrgVZa4oA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=W5sCerlbRaIwDhkx/jtw23b73kbG4pxNPZRtFF82VHY=; b=dMEatej2svpkOp9Z39D9peC6KDkSOhdfuOjXisvJeyoLbyQwCh63QvM0oeShgAaUj2 sJ+kxSPCr3s/2DBRQCZsCFqO+OfS6MlPL7tGxq3ij9KHV3c/yoXKILAcxv4kxOiozUzS 7sIRVE+zxlhAnXzqEiEBUvGYrs8owIto1vUzyrVaW0FFeHYYXkLA7KftbvzdErLl+IFm zp164xsa8Nnfj2ddhu98QsmwcejeKOjqm8SDCG7B9r7Pd6+6lx98teCHPNPIazFyKI7e qEA7hkmu/ER5nEHYTXSBMYOVjk8C0V4Q22E4NXr/Z7QPD1UdqBT1pXVlfilfJMg/H1d+ Neng== X-Gm-Message-State: ALoCoQlkkcxMohirPrJT8KhU712/FHYGfgUyLInub+iDam4/+xcel0NDPoa0i0Ss0Qo93d1olzuy X-Received: by 10.68.25.170 with SMTP id d10mr15776298pbg.78.1382326038727; Sun, 20 Oct 2013 20:27:18 -0700 (PDT) Received: from localhost.localdomain (50-193-42-9-static.hfc.comcastbusiness.net. [50.193.42.9]) by mx.google.com with ESMTPSA id ik1sm17653781pbc.9.2013.10.20.20.27.16 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 20 Oct 2013 20:27:18 -0700 (PDT) From: Benson Leung To: wsa@the-dreams.de, mika.westerberg@linux.intel.com, khali@linux-fr.org, andriy.shevchenko@linux.intel.com, jacmet@sunsite.dk, linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Cc: dlaurie@chromium.org, bleung@chromium.org Subject: [PATCH 2/2] i2c-designware-pci: Index Haswell ULT bus names from 0 Date: Sun, 20 Oct 2013 20:26:50 -0700 Message-Id: <1382326010-4554-3-git-send-email-bleung@chromium.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1382326010-4554-1-git-send-email-bleung@chromium.org> References: <1382326010-4554-1-git-send-email-bleung@chromium.org> Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Rather than having the bus names be "i2c-designware-pci--1" because we have set the .bus_num to -1 to force dynamic allocation, lets have the busses named "i2c-designware-pci-0" and "i2c-designware-pci-1" to correspond to the correct names of these busses. The adapter number will still be dynamically assigned. Signed-off-by: Benson Leung --- drivers/i2c/busses/i2c-designware-pcidrv.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/i2c/busses/i2c-designware-pcidrv.c b/drivers/i2c/busses/i2c-designware-pcidrv.c index e4cbbdf..d08b2d9 100644 --- a/drivers/i2c/busses/i2c-designware-pcidrv.c +++ b/drivers/i2c/busses/i2c-designware-pcidrv.c @@ -229,7 +229,7 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev, { struct dw_i2c_dev *dev; struct i2c_adapter *adap; - int r; + int r, adapter_num; struct dw_pci_controller *controller; if (id->driver_data >= ARRAY_SIZE(dw_pci_controllers)) { @@ -287,8 +287,18 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev, adap->algo = &i2c_dw_algo; adap->dev.parent = &pdev->dev; adap->nr = controller->bus_num; - snprintf(adap->name, sizeof(adap->name), "i2c-designware-pci-%d", - adap->nr); + + switch (id->driver_data) { + case haswell_0: + case haswell_1: + adapter_num = id->driver_data - haswell_0; + break; + default: + adapter_num = adap->nr; + break; + } + snprintf(adap->name, sizeof(adap->name), "i2c-designware-pci-%ld", + adapter_num); r = devm_request_irq(&pdev->dev, pdev->irq, i2c_dw_isr, IRQF_SHARED, adap->name, dev);