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: 854266 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3z8vnQ6pr6z9t3w for ; Mon, 1 Jan 2018 09:16:58 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750897AbdLaWQy (ORCPT ); Sun, 31 Dec 2017 17:16:54 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:57770 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750936AbdLaWQx (ORCPT ); Sun, 31 Dec 2017 17:16:53 -0500 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 CC: linuxppc-dev@lists.ozlabs.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:9zYTbPOGd7c=:JJu4QSrUWL6QFK1tQcBW1p TLQt6Sd/pJgEba92Ikw3LHT5zTG4wzjlY/h4vzr9XbCRxDhS9abPLZdv32F8+JbtDBHyDSWFH w8HVg9Zb0QAph7ERAQuF4EaxYPl+sJSPEZIM0XjrjJrqbySbEa1O6Xn67xTkFFpP1bde1p2Ob vqybEKiE73T4WTPx8rbyXasrnUxLXM5W6usRwxgIz+zTZogzEXoXb7Q070FbxAXFIoTWCAWTU PukrJZD6CSzFbI18KVzal6LHjfxykStOk2krL+4zkpCVaTwNu3QsGcr/qge/mFaO4Job+IvQ9 45snM7lDFAE+exvAnfdozdmX+QtIKvB4FSXDO2oJOEjD0FMseOkVaNqTjIcM/VFeB3XxQBRLL cY+6z0EW7EoAKkFvFCE2uHMQ/foZkBLb4k9ZpNiQFefNHanlvz5qhSuDG9YLkQCghZUYfg3E8 3YJOo0ykOhyvVsjjTJlS09h7CEQdNRXh17Lwi4/jmdf5shh8uILJ8xa3hEqdhrPBEmecD6ZZ6 aoI+M/Ujjc6sE6RISHZRtxo3pZQEZeBNGoFd8IAyH9i8iYc/cHf7rlOasYhaI4VzGIIT5J8gX M45sdu7r2KpowZ8R85HuJfLbGp0IgQFXy/MgHg/fdUF5Tg3e0PPnlx+CJ7JGXWGci5GNwlZif y8d9YK9nR9OrynCAYg1vqx1JV4xJIIoW9FJjMRgy9hoxYYJ+SHAWvp643ARTJfxZUiyRjfhrg XphRY9xxRKXPZAdCojVISaF/LOtuTBOlPlV3ug== Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org 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;