From patchwork Tue Jan 24 12:51:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Darren Stevens X-Patchwork-Id: 719120 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 3v77Pj0xKMz9t0G for ; Tue, 24 Jan 2017 23:52:41 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3v77Ph75kxzDqf3 for ; Tue, 24 Jan 2017 23:52:40 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.17.24]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3v77NT0syyzDqHy for ; Tue, 24 Jan 2017 23:51:34 +1100 (AEDT) Received: from mintppc.lan ([86.156.215.177]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.179]) with ESMTPA (Nemesis) id 0MNKx7-1ccLA103bN-006vMU; Tue, 24 Jan 2017 13:51:20 +0100 From: Darren Stevens To: wsa@the-dreams.de, linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Date: Tue, 24 Jan 2017 12:51:16 +0000 (GMT) Message-ID: <497b0eb4324.3a9cb4bf@auth.smtp.1and1.co.uk> User-Agent: YAM/2.9p1 (AmigaOS4; PPC; rv:20140418r7798) Subject: [PATCH] i2c/pasemi: Remove hardcoded bus numbers on smbus MIME-Version: 1.0 Content-type: multipart/mixed; boundary="--=_BOUNDARY.6d4cd53077b1d5af.97" X-Provags-ID: V03:K0:g1ZCitpC14Z58h94cjPitD2bS59dGUrmb4+DvDVOcx5Q+2nBD7l 9p/YtcTKKUqE9fAhCCE7UM+hsDJZkRc180K8g4XhVZTHfGoYTSCIDkVAcq+u+9KvVH5jOA8 D+H6Eq/H8epRksJcHsVm2w60itUovpXyM0XpwaLaZxzyPUbfaY14KBuia+3p0uwadxifNjU Tex/msGze0u4J4EidG0tQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:3nl7vqdnyTI=:JFT3jXte1ivoDDTncTy8sY M4rY2Q4IDDS/6AK1hQuXoEZcPBiwI+0bMvXRdgu3vLxyJCUSvyxYYQ++WtMvOTvi7Kw8ohT+o pqjDLOyi5vgBUtnjnfYQSBEkcVD8zw87+2s60WOHIT+IXndQOe+yoZn/JFBKtPl5JauuD/Tc7 AYnhHyQZLw6ElYNQVqRo5p+Ug3ReI7tiQZe3gEs1zWGm0/bg8t6rAqDXmzda0sB+TDQEGJ1hl Cdu2Ky2zNCoAIc//Po9D6D6ecGzNqVZbO7mRaTOMyMhTGj5vrTr3g2/VNEFvr/Be+SqUCgpFl YzkEmuMZVqKnvF2vC9qr1vJA02fYlyeJLATPGEEiRg6H6TxcQZJc3I0gncGiVN3cTTSyVF4Kv XP6oEG11bTbfvOUR3vNHs4jLRMMmC+bJd/TPaVSTS7rqDHixDs9vQtej2TSmPUwXDv6txun2c e8gt0Icw6I/s6914QzGxr3eqrfDx9KwUBoPxircKADgFsbL6MxMBE4P5MOn8MHj3DJcOLL4sk NStdBxeysPpEBn+vKZnSxBeTKLbXGf7PKvs2p1P5T5tGEtjrJFkoKwflAspnaq/2T2TdIA6ZF 1G4PzBGwBI4kk/xTHKNUM8CA20MTWPiCCu3zylGY7rUYUD8O38qsjkipWX+unnLmcb55AK+59 yiUgOL7A2eh3nSj91TYvSi2rnP+S88OvzzBS7KW1sQ5Y4rGassFh/hfbIyNTc0Ai/MK8= X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pat Wall , "R.T.Dickinson" , linuxppc-dev@lists.ozlabs.org, Christian Zigotzky 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;