@@ -73,42 +73,6 @@ static struct i2c_dev *i2c_dev_get_by_minor(unsigned index)
return i2c_dev;
}
-static struct i2c_dev *get_free_i2c_dev(struct i2c_adapter *adap)
-{
- struct i2c_dev *i2c_dev;
-
- if (adap->nr >= I2C_MINORS) {
- pr_err("Out of device minors (%d)\n", adap->nr);
- return ERR_PTR(-ENODEV);
- }
-
- i2c_dev = kzalloc_obj(*i2c_dev);
- if (!i2c_dev)
- return ERR_PTR(-ENOMEM);
- i2c_dev->adap = adap;
-
- spin_lock(&i2c_dev_list_lock);
- list_add_tail(&i2c_dev->list, &i2c_dev_list);
- spin_unlock(&i2c_dev_list_lock);
- return i2c_dev;
-}
-
-static void put_i2c_dev(struct i2c_dev *i2c_dev, bool del_cdev)
-{
- spin_lock(&i2c_dev_list_lock);
- list_del(&i2c_dev->list);
- spin_unlock(&i2c_dev_list_lock);
- if (del_cdev) {
- cdev_device_del(&i2c_dev->cdev, &i2c_dev->dev);
-
- scoped_guard(rwsem_write, &i2c_dev->rwsem) {
- i2c_dev->adap = NULL;
- }
- }
-
- put_device(&i2c_dev->dev);
-}
-
static ssize_t name_show(struct device *dev,
struct device_attribute *attr, char *buf)
{
@@ -718,11 +682,17 @@ static int i2cdev_attach_adapter(struct device *dev)
return NOTIFY_DONE;
adap = to_i2c_adapter(dev);
- i2c_dev = get_free_i2c_dev(adap);
- if (IS_ERR(i2c_dev))
+ if (adap->nr >= I2C_MINORS) {
+ pr_err("Out of device minors (%d)\n", adap->nr);
+ return NOTIFY_DONE;
+ }
+
+ i2c_dev = kzalloc_obj(*i2c_dev);
+ if (!i2c_dev)
return NOTIFY_DONE;
init_rwsem(&i2c_dev->rwsem);
+ i2c_dev->adap = adap;
cdev_init(&i2c_dev->cdev, &i2cdev_fops);
i2c_dev->cdev.owner = adap->owner;
@@ -741,11 +711,15 @@ static int i2cdev_attach_adapter(struct device *dev)
if (res)
goto err_put_i2c_dev;
+ spin_lock(&i2c_dev_list_lock);
+ list_add_tail(&i2c_dev->list, &i2c_dev_list);
+ spin_unlock(&i2c_dev_list_lock);
+
pr_debug("adapter [%s] registered as minor %d\n", adap->name, adap->nr);
return NOTIFY_OK;
err_put_i2c_dev:
- put_i2c_dev(i2c_dev, false);
+ put_device(&i2c_dev->dev);
return NOTIFY_DONE;
}
@@ -762,7 +736,17 @@ static int i2cdev_detach_adapter(struct device *dev)
if (!i2c_dev) /* attach_adapter must have failed */
return NOTIFY_DONE;
- put_i2c_dev(i2c_dev, true);
+ spin_lock(&i2c_dev_list_lock);
+ list_del(&i2c_dev->list);
+ spin_unlock(&i2c_dev_list_lock);
+
+ cdev_device_del(&i2c_dev->cdev, &i2c_dev->dev);
+
+ scoped_guard(rwsem_write, &i2c_dev->rwsem) {
+ i2c_dev->adap = NULL;
+ }
+
+ put_device(&i2c_dev->dev);
pr_debug("adapter [%s] unregistered\n", adap->name);
return NOTIFY_OK;
Drop the get_free_i2c_dev() and put_i2c_dev() helpers and do all set up and tear down directly in i2cdev_attach_adapter() and i2cdev_detach_adapter() for consistency and to make the logic clearer. Note that the device list is only used at detach so the i2c-dev can be added after registering the class device. Signed-off-by: Johan Hovold <johan@kernel.org> --- drivers/i2c/i2c-dev.c | 64 ++++++++++++++++--------------------------- 1 file changed, 24 insertions(+), 40 deletions(-)