From patchwork Sun Dec 31 20:53:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Darren Stevens X-Patchwork-Id: 854272 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3z8vzC0Cvfz9t3w for ; Mon, 1 Jan 2018 09:25:27 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3z8vzB6BFrzDr91 for ; Mon, 1 Jan 2018 09:25:26 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=stevens-zone.net (client-ip=212.227.17.24; helo=mout.kundenserver.de; envelope-from=darren@stevens-zone.net; receiver=) Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.17.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3z8vvL5q4dzDr29 for ; Mon, 1 Jan 2018 09:22:06 +1100 (AEDT) Received: from [127.0.0.1] ([86.161.101.150]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.179]) with ESMTPA (Nemesis) id 0LalfU-1fBgFO3yWG-00kONA; Sun, 31 Dec 2017 23:16:51 +0100 From: Darren Stevens To: wsa@the-dreams.de, linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Date: Sun, 31 Dec 2017 20:53:55 +0000 (GMT) Message-ID: <4b3d0f2cad0.58555470@auth.smtp.1and1.co.uk> User-Agent: YAM/2.9p1 (AmigaOS4; PPC; rv:20140418r7798) Subject: [RESEND PATCH] i2c/busses/pasemi: Remove hardcoded bus numbers on smbus MIME-Version: 1.0 Content-type: multipart/mixed; boundary="--=_BOUNDARY.6c3689407220717c.e5" X-Provags-ID: V03:K0:gACpGltKXR4uc6Zx2BVZChZSVVZfGKE8YEx1DuAoOghWbO5D4VG EyO+cWzZcu8mKI1dwsFDkIbqWvhssfuXdJubh58nxTTtkiWKJNZH7TIdj5UQ8hMTfbyGoC+ N6CZzTeBuVTeP5G82CKM2y0b1Lm1SSg2rU83dL8OusdbmaBSbuN9RhHL7/coLJ1eCfmBa2M ZBiTYA88eqLwzT0DAV1wA== X-UI-Out-Filterresults: notjunk:1; V01:K0:jLRtWxdwq/E=:zbfeoBBR/umpCqp3ClX/TQ kHnNKgfdpDPX/sDbbXgWcVQG0aVPUdDAGABAV0Qic5E+xZZ5FpFNGKyPyBWsrLQt5ERuJPS8a BSDeDnTCDrIML5qZBWvqUnmebjvBEq/Z+lvnb35DUmf88ysrvYqdvk40Pw7DaiSg+2cFMhxIh mYhR+dZbRoFbL2qiKzhMyM29vTEs+5fNUVI6rmbsuHIf3wvEuq0gag8VAuPDyZgtNWBM9n0nn jM7gxW+Bmtzqj8isKcUilUClLQzuoJav2SbXUS4BjhbqKmf0TJhq3s+4tLieh4fUM6wW4ntdO p42N4tzMcxd5wTsxmRweeZ9UjyBIiykYL3JNi542yO4IKMEO2KCLRiXLWltCOGU+lB1QKwIth HqwD0TiyQuo1aDyj5jpKNAjbJXHmTCeAG9jS9sk2oEs3RMX7Y30eUp6shBJegBIgFLaHj6jWh vkyc509JPULb5RwnsivjRTVT3cZpXSORyB5ZLifQx6DMDHi6czjJP6NevCQoV2MUHx8IsAJmS a2/EmIZ/dWXfb0Xy2WlnjwHDYq+oV3POo+q7P2X8xP0cCSISIASTyy/E9X1EbeIy80bZuoggK f4nvOlEPYS5pD8lixgPkCt/G0ddn6fkHj2WoDfQuTnokVyc7NoOuJEZugmPkQCEYQCrrOW8vW aUrjiOh6g/y0S7ngby28/xuBlj6hmuZ38VMM7NDXEW97dRrNPHgKp7gN7Y3ejjyXyyh2xHS/T Lrw15Y6muRi1ENSysYIVxjw0suTK856B+jhdYw== X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.24 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linuxppc-dev@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" The pasemi smbus controller uses PCI_FUNC(dev->devfn) to define which number bus to attach to, however this fails when something else is probed first, for example an ATI Radeon graphics card will claim 9 or 10 busses, including the ones the pasemi wants. Patch the driver to call i2c_add_adapter rather than i2c_add_numbered_adapter. Signed-off-by: Darren Stevens diff --git a/drivers/i2c/busses/i2c-pasemi.c b/drivers/i2c/busses/i2c-pasemi.c index df1dbc9..05847fd 100644 --- a/drivers/i2c/busses/i2c-pasemi.c +++ b/drivers/i2c/busses/i2c-pasemi.c @@ -365,7 +365,6 @@ static int pasemi_smb_probe(struct pci_dev *dev, smbus->adapter.class = I2C_CLASS_HWMON | I2C_CLASS_SPD; smbus->adapter.algo = &smbus_algorithm; smbus->adapter.algo_data = smbus; - smbus->adapter.nr = PCI_FUNC(dev->devfn); /* set up the sysfs linkage to our parent device */ smbus->adapter.dev.parent = &dev->dev; @@ -373,7 +372,7 @@ static int pasemi_smb_probe(struct pci_dev *dev, reg_write(smbus, REG_CTL, (CTL_MTR | CTL_MRR | (CLK_100K_DIV & CTL_CLK_M))); - error = i2c_add_numbered_adapter(&smbus->adapter); + error = i2c_add_adapter(&smbus->adapter); if (error) goto out_release_region;