From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x227Ui9Zh6TenECP77kFNYYGOPTDm8D7AhJPlybI7waPn0wWtQjM38ki4QpQMfjdC7CAEQSOe ARC-Seal: i=1; a=rsa-sha256; t=1516732689; cv=none; d=google.com; s=arc-20160816; b=yaNjyo3KHyQfg2ufnuR770a0NZimjxWF14qou0WYGn4/HMyzdGeBMzOUfYJI4vgE8H 8s6zf8YT99bHfiEYuQSj4WD5l4GbrfqGKT3dQRVhWoQJsUIN4q/tTeObtkp+YirPteXm 6P3nGlLbO82+gJNNtWtrg+GjXYgu2yeL3QhRveWnOlRmMQvD4Mk5zcpauLDS5vdH/5ca tPwRGOehKkcaOjl2Ae0zJsIZRhjIUgB2htZahINxIu+s6ZBGAWptaVgkiyEZiIKNm7oJ VM09X/cm/zVxcboFF1V2UzYf/c65aNyBUU9oedaH5WN5mls1AoK6oQ7WO1+zwogUGSpr A7+Q== 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=i5JuFlHBYSId+FN8xj4gz4xi+qlcFbZXaZ7wZ/21h+Y=; b=M1M43ckqGegFjo3BPIL7P+XefUW11zuWz/Jx45ytE86xbnY1SfI6rf188tKTWAIGy8 /PgVk7AnJqZflTxAxpYjs0/vRMGLhcaoDPmqAhhBFyZnoAkui510Vi7hTHWn/GlcT3NN Q3c/95Rj0AT/M1aV3oIvDTuVCwBSrBd8N13TSdRSyn0tCu6h8vjjGlFVjj4cslfX3S2g 6Su+yIst0xVCbQoWvvgn6WJb4hl+dO5jb0ZdfWe0YNqrERTfrqWsKYTci6PLTGqtblx6 8FeajyypzFdlGqRX6VHRFMh/LHS46uyCeaY9kVgSDtH/r33T2Y9xWvOvJ+vHMJwpX3eU NKXQ== 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 v10 2/6] platform/mellanox: Group create/destroy with attribute functions Date: Tue, 23 Jan 2018 20:34:21 +0000 Message-Id: <1516739665-132304-2-git-send-email-vadimp@mellanox.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1516739665-132304-1-git-send-email-vadimp@mellanox.com> References: <1516739665-132304-1-git-send-email-vadimp@mellanox.com> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1590409496693172351?= X-GMAIL-MSGID: =?utf-8?q?1590409496693172351?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: Move the mlxreg_hotplug_device_create and _destroy functions up with the related attribute functions. No functional changes. Signed-off-by: Vadim Pasternak Acked-by: Andy Shevchenko v9->v10: Fixes provideded by Darren: - make separate patch for relocating create/destroy; --- drivers/platform/mellanox/mlxreg-hotplug.c | 70 +++++++++++++++--------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/drivers/platform/mellanox/mlxreg-hotplug.c b/drivers/platform/mellanox/mlxreg-hotplug.c index c015fe9..1a04cb2 100644 --- a/drivers/platform/mellanox/mlxreg-hotplug.c +++ b/drivers/platform/mellanox/mlxreg-hotplug.c @@ -98,6 +98,41 @@ struct mlxreg_hotplug_priv_data { u8 fan_cache; }; +static int mlxreg_hotplug_device_create(struct device *dev, + struct mlxreg_hotplug_device *item) +{ + item->adapter = i2c_get_adapter(item->bus); + if (!item->adapter) { + dev_err(dev, "Failed to get adapter for bus %d\n", + item->bus); + return -EFAULT; + } + + item->client = i2c_new_device(item->adapter, &item->brdinfo); + if (!item->client) { + dev_err(dev, "Failed to create client %s at bus %d at addr 0x%02x\n", + item->brdinfo.type, item->bus, item->brdinfo.addr); + i2c_put_adapter(item->adapter); + item->adapter = NULL; + return -EFAULT; + } + + return 0; +} + +static void mlxreg_hotplug_device_destroy(struct mlxreg_hotplug_device *item) +{ + if (item->client) { + i2c_unregister_device(item->client); + item->client = NULL; + } + + if (item->adapter) { + i2c_put_adapter(item->adapter); + item->adapter = NULL; + } +} + static ssize_t mlxreg_hotplug_attr_show(struct device *dev, struct device_attribute *attr, char *buf) @@ -183,41 +218,6 @@ static int mlxreg_hotplug_attr_init(struct mlxreg_hotplug_priv_data *priv) return 0; } -static int mlxreg_hotplug_device_create(struct device *dev, - struct mlxreg_hotplug_device *item) -{ - item->adapter = i2c_get_adapter(item->bus); - if (!item->adapter) { - dev_err(dev, "Failed to get adapter for bus %d\n", - item->bus); - return -EFAULT; - } - - item->client = i2c_new_device(item->adapter, &item->brdinfo); - if (!item->client) { - dev_err(dev, "Failed to create client %s at bus %d at addr 0x%02x\n", - item->brdinfo.type, item->bus, item->brdinfo.addr); - i2c_put_adapter(item->adapter); - item->adapter = NULL; - return -EFAULT; - } - - return 0; -} - -static void mlxreg_hotplug_device_destroy(struct mlxreg_hotplug_device *item) -{ - if (item->client) { - i2c_unregister_device(item->client); - item->client = NULL; - } - - if (item->adapter) { - i2c_put_adapter(item->adapter); - item->adapter = NULL; - } -} - static inline void mlxreg_hotplug_work_helper(struct device *dev, struct mlxreg_hotplug_device *item, u8 is_inverse, -- 2.1.4