From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x225u8h1ZnwnGM9hTn8nM1WmvnQQja/IG032VjD9In9riX1ppHDPVMXN1EBxmmV+QaRQf1Vcw ARC-Seal: i=1; a=rsa-sha256; t=1516819034; cv=none; d=google.com; s=arc-20160816; b=QLClQzuMPImcEKm/YAdDpxHzNkbQUhxvOwa0oiU2eVUxxB88cg21A4usgcutmVb9rV OLHKiphWX10Z7NcIWZie6Ogp7dqYjRT73CUD5pzOwBORKCAUDtLSCUklyoW2uqnkw6Hu VaR7x6SnRDxc6CfsCeQQqZw2gRf1GJr933huKxqAK4ycCMdKDZLgCqlwOeio2XFInr6T F3bKU+KSfRC7PhN5OvUrGLovEFHbrzxO8S4JhJXBRXoR+60xrzZakABB5DjGr/lXxfQB +vUmOF8uXnLzXwj1pKDiZHB94xIj4t3F9BCQBnaciE8F7VGP3RyaWW+JQkqnFSZbNkLX rWuw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=xZe25ojSPfRFZnJvLxnKyyMMMv2wlNAQ3Rpqg+Vv4eo=; b=ZoAHpRb4hWSNFXwmIMKnlkGFQdTV5uX1dDbl7Un7zuF9afxapeExw2LmS5O/qaHLrE xVKP3GCU/i63HtxMd21r2bNwJeRDJmbjgZnIQvmcHLo5fYYdnuh7wzFF+bBN9KtXnc/b xJ//uTju5Hdv0oC/xmeNFv1Dnle4/fHil+FcK9i+Gm0hv/8JjJJ6ZQ6jWbcggCdGfcst waeBLyHJlWLFEJX4LHzOc3n3c8/8YClm7F7UnIpj1INy6dtcBMZs60nRyUQ2GA0ZlQdF M95Pl6Md9K9sr620Zi3CERYZZ/y7085uKduhSPRGDLFxbTfZQBiERf5rvXG4YjXzpMj9 xX0Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of vadimp@mellanox.com designates 193.47.165.129 as permitted sender) smtp.mailfrom=vadimp@mellanox.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=mellanox.com Authentication-Results: mx.google.com; spf=pass (google.com: domain of vadimp@mellanox.com designates 193.47.165.129 as permitted sender) smtp.mailfrom=vadimp@mellanox.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=mellanox.com From: Vadim Pasternak To: dvhart@infradead.org, andy.shevchenko@gmail.com, gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, platform-driver-x86@vger.kernel.org, jiri@resnulli.us, Vadim Pasternak Subject: [patch v11 - re-ordered 05/12] platform/mellanox: Rename i2c bus to nr Date: Wed, 24 Jan 2018 20:33:39 +0000 Message-Id: <1516826019-124903-3-git-send-email-vadimp@mellanox.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1516826019-124903-1-git-send-email-vadimp@mellanox.com> References: <1516826019-124903-1-git-send-email-vadimp@mellanox.com> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1590500036441313194?= X-GMAIL-MSGID: =?utf-8?q?1590500036441313194?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: Use Linux convention of nr instead of bus for i2c adapter number. Signed-off-by: Vadim Pasternak Acked-by: Andy Shevchenko [dvhart: refactored commit into smaller functional changes] Signed-off-by: Darren Hart (VMware) --- drivers/platform/mellanox/mlxreg-hotplug.c | 2 +- drivers/platform/x86/mlx-platform.c | 16 ++++++++-------- include/linux/platform_data/mlxreg.h | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/platform/mellanox/mlxreg-hotplug.c b/drivers/platform/mellanox/mlxreg-hotplug.c index 4b67909..2b3b82c 100644 --- a/drivers/platform/mellanox/mlxreg-hotplug.c +++ b/drivers/platform/mellanox/mlxreg-hotplug.c @@ -101,7 +101,7 @@ struct mlxreg_hotplug_priv_data { static int mlxreg_hotplug_device_create(struct device *dev, struct mlxreg_hotplug_device *item) { - item->adapter = i2c_get_adapter(item->bus); + item->adapter = i2c_get_adapter(item->nr); if (!item->adapter) return -EFAULT; diff --git a/drivers/platform/x86/mlx-platform.c b/drivers/platform/x86/mlx-platform.c index 0fbec1f..5601714 100644 --- a/drivers/platform/x86/mlx-platform.c +++ b/drivers/platform/x86/mlx-platform.c @@ -141,41 +141,41 @@ static struct i2c_mux_reg_platform_data mlxplat_mux_data[] = { static struct mlxreg_hotplug_device mlxplat_mlxcpld_psu[] = { { .brdinfo = { I2C_BOARD_INFO("24c02", 0x51) }, - .bus = 10, + .nr = 10, }, { .brdinfo = { I2C_BOARD_INFO("24c02", 0x50) }, - .bus = 10, + .nr = 10, }, }; static struct mlxreg_hotplug_device mlxplat_mlxcpld_pwr[] = { { .brdinfo = { I2C_BOARD_INFO("dps460", 0x59) }, - .bus = 10, + .nr = 10, }, { .brdinfo = { I2C_BOARD_INFO("dps460", 0x58) }, - .bus = 10, + .nr = 10, }, }; static struct mlxreg_hotplug_device mlxplat_mlxcpld_fan[] = { { .brdinfo = { I2C_BOARD_INFO("24c32", 0x50) }, - .bus = 11, + .nr = 11, }, { .brdinfo = { I2C_BOARD_INFO("24c32", 0x50) }, - .bus = 12, + .nr = 12, }, { .brdinfo = { I2C_BOARD_INFO("24c32", 0x50) }, - .bus = 13, + .nr = 13, }, { .brdinfo = { I2C_BOARD_INFO("24c32", 0x50) }, - .bus = 14, + .nr = 14, }, }; diff --git a/include/linux/platform_data/mlxreg.h b/include/linux/platform_data/mlxreg.h index 8dcbb8e..ffbcb78 100644 --- a/include/linux/platform_data/mlxreg.h +++ b/include/linux/platform_data/mlxreg.h @@ -39,7 +39,7 @@ * @adapter: I2C device adapter; * @client: I2C device client; * @brdinfo: device board information; - * @bus: I2C bus, where device is attached; + * @nr: I2C device adapter number, to which device is to be attached; * * Structure represents I2C hotplug device static data (board topology) and * dynamic data (related kernel objects handles). @@ -48,7 +48,7 @@ struct mlxreg_hotplug_device { struct i2c_adapter *adapter; struct i2c_client *client; struct i2c_board_info brdinfo; - u16 bus; + int nr; }; /** -- 2.1.4