From khali@linux-fr.org Sun Sep 3 13:19:33 2006 Date: Sun, 3 Sep 2006 22:19:25 +0200 From: Jean Delvare To: Greg KH Cc: Linux I2C Subject: [PATCH 01/13] i2c-dev: attach/detach_adapter cleanups Message-Id: <20060903221925.0db654fd.khali@linux-fr.org> Content-Disposition: inline; filename=i2c-dev-attach-detach-adapter-cleanups.patch i2c-dev: attach/detach_adapter cleanups * Only print that an adapter was attached when it succeeds. * i2c_dev == NULL on detach simply means that the attach failed before, this isn't an error per se. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman --- drivers/i2c/i2c-dev.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) --- gregkh-2.6.orig/drivers/i2c/i2c-dev.c +++ gregkh-2.6/drivers/i2c/i2c-dev.c @@ -413,9 +413,6 @@ static int i2cdev_attach_adapter(struct if (IS_ERR(i2c_dev)) return PTR_ERR(i2c_dev); - pr_debug("i2c-dev: adapter [%s] registered as minor %d\n", - adap->name, adap->nr); - /* register this i2c device with the driver core */ i2c_dev->dev = device_create(i2c_dev_class, &adap->dev, MKDEV(I2C_MAJOR, adap->nr), @@ -427,6 +424,9 @@ static int i2cdev_attach_adapter(struct res = device_create_file(i2c_dev->dev, &dev_attr_name); if (res) goto error_destroy; + + pr_debug("i2c-dev: adapter [%s] registered as minor %d\n", + adap->name, adap->nr); return 0; error_destroy: @@ -442,8 +442,8 @@ static int i2cdev_detach_adapter(struct struct i2c_dev *i2c_dev; i2c_dev = i2c_dev_get_by_minor(adap->nr); - if (!i2c_dev) - return -ENODEV; + if (!i2c_dev) /* attach_adapter must have failed */ + return 0; device_remove_file(i2c_dev->dev, &dev_attr_name); return_i2c_dev(i2c_dev);