From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755396Ab0IMTsj (ORCPT ); Mon, 13 Sep 2010 15:48:39 -0400 Received: from zone0.gcu-squad.org ([212.85.147.21]:22643 "EHLO services.gcu-squad.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755353Ab0IMTsh (ORCPT ); Mon, 13 Sep 2010 15:48:37 -0400 Date: Mon, 13 Sep 2010 21:48:00 +0200 From: Jean Delvare To: Guenter Roeck Cc: Andrew Morton , lm-sensors@lm-sensors.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 3/7] hwmon: (lm90) Introduce function to delete sysfs files Message-ID: <20100913214800.7b975fbb@hyperion.delvare> In-Reply-To: <1284038750-8833-4-git-send-email-guenter.roeck@ericsson.com> References: <1284038750-8833-1-git-send-email-guenter.roeck@ericsson.com> <1284038750-8833-4-git-send-email-guenter.roeck@ericsson.com> X-Mailer: Claws Mail 3.5.0 (GTK+ 2.14.4; i586-suse-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 9 Sep 2010 06:25:46 -0700, Guenter Roeck wrote: > Signed-off-by: Guenter Roeck > --- > drivers/hwmon/lm90.c | 18 +++++++++++------- > 1 files changed, 11 insertions(+), 7 deletions(-) > > diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c > index a81a053..f21dde5 100644 > --- a/drivers/hwmon/lm90.c > +++ b/drivers/hwmon/lm90.c > @@ -815,6 +815,15 @@ static int lm90_detect(struct i2c_client *new_client, > return 0; > } > > +static void lm90_remove_files(struct i2c_client *client, struct lm90_data *data) > +{ > + if (data->flags & LM90_HAVE_OFFSET) > + device_remove_file(&client->dev, > + &sensor_dev_attr_temp2_offset.dev_attr); > + device_remove_file(&client->dev, &dev_attr_pec); > + sysfs_remove_group(&client->dev.kobj, &lm90_group); > +} > + > static int lm90_probe(struct i2c_client *new_client, > const struct i2c_device_id *id) > { > @@ -889,8 +898,7 @@ static int lm90_probe(struct i2c_client *new_client, > return 0; > > exit_remove_files: > - sysfs_remove_group(&new_client->dev.kobj, &lm90_group); > - device_remove_file(&new_client->dev, &dev_attr_pec); > + lm90_remove_files(new_client, data); > exit_free: > kfree(data); > exit: > @@ -937,11 +945,7 @@ static int lm90_remove(struct i2c_client *client) > struct lm90_data *data = i2c_get_clientdata(client); > > hwmon_device_unregister(data->hwmon_dev); > - sysfs_remove_group(&client->dev.kobj, &lm90_group); > - device_remove_file(&client->dev, &dev_attr_pec); > - if (data->flags & LM90_HAVE_OFFSET) > - device_remove_file(&client->dev, > - &sensor_dev_attr_temp2_offset.dev_attr); > + lm90_remove_files(client, data); > > /* Restore initial configuration */ > i2c_smbus_write_byte_data(client, LM90_REG_W_CONFIG1, Looks good. Applied, thanks! -- Jean Delvare