From patchwork Sun Feb 26 21:49:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Darren Stevens X-Patchwork-Id: 732585 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 3vWdph45cFz9sDC for ; Mon, 27 Feb 2017 08:51:56 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3vWdph3KkfzDqLk for ; Mon, 27 Feb 2017 08:51:56 +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 [217.72.192.74]) (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 3vWdnd2n5KzDqGg for ; Mon, 27 Feb 2017 08:51:00 +1100 (AEDT) Received: from [127.0.0.1] ([86.176.62.25]) by mrelayeu.kundenserver.de (mreue103 [212.227.15.179]) with ESMTPA (Nemesis) id 0MIPbr-1ckZPb2fd9-004DIi; Sun, 26 Feb 2017 22:49:52 +0100 From: Darren Stevens To: wsa@the-dreams.de, linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Date: Sun, 26 Feb 2017 21:49:47 +0000 (GMT) Message-ID: <49a70e4c93e.69f983e3@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.6f0aa3906112474f.a6" X-Provags-ID: V03:K0:O8BDnMhVwRdE3AsV9hd0N7xPBj3ENbGqqClvLWkp6caYeizQzTM 5UIcRpsb83q4+qNBKpMVybiqynB+SYx+G5GnuCMYKwWyV0UEEo5R+6oZDty2/uqd4DG8NLw K9IP9TtWxnPE3UQZ8r6+TwvT4MKu/ioolpR1ccEIsxty0cVgbZdK5329T37UlDAE1Au/832 RosqxMc0VenyEgE8t1c4w== X-UI-Out-Filterresults: notjunk:1; V01:K0:Mpuw+e/G2dU=:5j1WT1qH1isduSjMQQFYDe fBA8GEg1/o6n8SuDavEl1ALLaF+1rPvnaJT0UT+WcjNYi4YOL1Q2f2V0E9T4Ne8qtBG3XBhun iENLk+QJ0n711CUq9h5GaMpKOmav7HZOB6QkXkAnb4nKreo5y0d1g6eswVWbyUdZPGb3ztxxm fim+XEIfglbl6I9Ii/XVLv8UPi/WRJKcbuxI8oU8ODmIHPLQgJiIfWYxcs69kbkoGtUptO6H3 WAxtD+4N4yMdwGYRvj3V7ywzp7SgGPnrNjCFsbKAeOYe1kIlFBPwJOBKdLmFp3AE/H5wtUurv jmcrOkJIVYbAXN6hIdfhZcLlVxVX1qBI9/rwt2FksJFehkzRvYbRMqcqKzgyDrsGajjgRYPxv 47ciJkRqerDIgb2p5eWwMzT9bTLdEg/u1rJvLSSHmAVAjTZsVWofLKY3PJizYZNW9LUTuAdVm wUtU3wjq9i6oFx9rJx8qS+3SpcZk0C37JSqa2BPblSa7yqmWMpt8xBX5NGw1OXM3M4ZJvdqhw JZEcbGXvq69zgWTI9DJK32Yka+voiRp117Qz635CrP6sCPPcKeGMvdcycncd5/xLUVeEurcuo 0Np8LWkUkdyBfReoSqzpWJndT2rfH0w36bR0xObfp4J0m9mnyMBJ79NfXCv/NXsT50kqEx3Wa hDIS69CQIQgmRFKp+qmzpkwquL41FLxKDNQZ27/Mk7/5OeaX2v+1OGwLFUWdUJxRVx2c= 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: 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 --- Resent as it doesn't seem to have reached linux-i2c mailing list. 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;