From patchwork Fri Jan 20 17:46:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Darren Stevens X-Patchwork-Id: 717856 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3v4phs2LBhz9s65 for ; Sat, 21 Jan 2017 05:12:45 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3v4phs09LxzDqSZ for ; Sat, 21 Jan 2017 05:12:45 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org X-Greylist: delayed 311 seconds by postgrey-1.36 at bilbo; Sat, 21 Jan 2017 05:09:37 AEDT Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.17.13]) (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 3v4pdF0pz3zDqS2 for ; Sat, 21 Jan 2017 05:09:36 +1100 (AEDT) Received: from mintppc.lan ([86.156.215.177]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.179]) with ESMTPA (Nemesis) id 0MHYWy-1cXwvZ3cIm-003Iat; Fri, 20 Jan 2017 19:04:14 +0100 From: Darren Stevens To: linuxppc-dev@lists.ozlabs.org Date: Fri, 20 Jan 2017 17:46:39 +0000 (GMT) Message-ID: <49760dd87cb.596db16f@auth.smtp.1and1.co.uk> User-Agent: YAM/2.9p1 (AmigaOS4; PPC; rv:20140418r7798) Subject: [PATCH v2] powerpc/pasemi: Remove hardcoded bus numbers on smbus MIME-Version: 1.0 X-Provags-ID: V03:K0:vZrFpEi1eGssuzZjy0M8NKDxdrml4UZFJaA0p+CPMSyH/Hj+EmX yMA/JEfjQTEkVRdRAXCKAU3t61cSh4YPAXUJAfDcfjExIgQCL6/f9IH6Bmx1vjMer2iN308 iO60R9X9GXW9UGk6bDrbhnj1bF9lYdE88ZnanHDIuAxlJ1sHQ7uHOi9ZVBPVjLZD55dWHPY YjQ2vR14oKbfpeCswVJ1w== X-UI-Out-Filterresults: notjunk:1; V01:K0:kwbOMjNx91Q=:pZwsmNg5fmWCl6XwTWI0HC kbO/YLNAqSlMO+Y8aPcMnGFo0VfFVjLGA6hXScoqjfzzd38dIbTWu6RtOUpMkShdStfcDuUHd W+wyjcjv65+KraACkfEN7DgJJZx7+OJBxsQ4jc5gcmXGGYbzbAdy1ix3Srh39LNf50ypMkzBA B5WCa20ZzXj/JQVYAqhW9TBfnnwzmCVz1rrpJ4H2VC7R24VzJYpLeq50OxuE4rfHcFASpbL9Z Q7e16PNJ9Mtx7AZU5ERmIJNN2GlopKpeAWg/1BkBHMUP2x0kLbZ+rT5rXzOl6KCY14s/eOdiX w6qpLFcj+zYZvHOQa5NUev5dyN50X8FFWe7KNHd0a1XIZzoh83T2o6HSLQz1iaWp7w7Ifh3w4 sL/kvWVzWH6Us2LxyAcEe1uCSdsAZmn/9XZXkshQEkL8xrSf7mIXbja3OalsKCLSKPF2NKPP2 +NR/91c5r03Fy1qKkkiX1RMq4x5mPXUcer2ZudC7NPwDQ4BK8ydXy9aGD4HMbbxp8aR9nIDi3 Z08A48HMSKx/iHZiMOkR9YUekM5T+eTSROyxJp25pB2FSPHpdl3Xk0cII8hGYc8CgLDZKUS1X VjQD/sWkdLCmDRq2zBs2qYDvRemg8dQjFAxVaDhV7yY05mDRvaLDoHGHtzsVdwVqsZlW9gTA/ NxfOoEypO1iT3u1NbYBN5n2m1INQes00s9QpDwaplB1U/FBSkjiA6XTQKlR7Ov4ZasKaDo2e/ q/H2+kp8py98HzHg 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" , 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 --- v2 - remove unnecessary smbus->adapter.nr initialisation. 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;