Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751105AbaBKKY3 (ORCPT ); Tue, 11 Feb 2014 05:24:29 -0500 Received: from mail-wi0-f182.google.com ([209.85.212.182]:55609 "EHLO mail-wi0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750776AbaBKKY0 (ORCPT ); Tue, 11 Feb 2014 05:24:26 -0500 From: Laszlo Papp To: jdelvare@suse.de Cc: linux@roeck-us.net, lm-sensors@lm-sensors.org, linux-kernel@vger.kernel.org, Laszlo Papp Subject: [PATCH] hwmon: (max6650) Dissociate the i2c device name from the hwmon device name Date: Tue, 11 Feb 2014 10:24:07 +0000 Message-Id: <1392114247-23921-1-git-send-email-lpapp@kde.org> X-Mailer: git-send-email 1.8.5.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is a necessary step to revamp the existing design of the driver for the overall functionality the chip can provide. This will create a clean name-space for each function. Signed-off-by: Laszlo Papp --- drivers/hwmon/max6650.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/hwmon/max6650.c b/drivers/hwmon/max6650.c index 0cafc39..d4b1450 100644 --- a/drivers/hwmon/max6650.c +++ b/drivers/hwmon/max6650.c @@ -518,6 +518,7 @@ static struct attribute *max6650_attrs[] = { &sensor_dev_attr_gpio2_alarm.dev_attr.attr, NULL }; +ATTRIBUTE_GROUPS(max6650); static struct attribute_group max6650_attr_grp = { .attrs = max6650_attrs, @@ -543,6 +544,7 @@ static int max6650_probe(struct i2c_client *client, const struct i2c_device_id *id) { struct max6650_data *data; + struct device *hwmon_dev; int err; data = devm_kzalloc(&client->dev, sizeof(struct max6650_data), @@ -574,8 +576,12 @@ static int max6650_probe(struct i2c_client *client, } data->hwmon_dev = hwmon_device_register(&client->dev); - if (!IS_ERR(data->hwmon_dev)) - return 0; + if (!IS_ERR(data->hwmon_dev)) { + hwmon_dev = devm_hwmon_device_register_with_groups(&client->dev, + client->name, data, + max6650_groups); + return PTR_ERR_OR_ZERO(hwmon_dev); + } err = PTR_ERR(data->hwmon_dev); dev_err(&client->dev, "error registering hwmon device.\n"); -- 1.8.5.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/