Skip to contentSkip to conversation

Input: mma8450 - convert to using managed resources

PATCH In review Dmitry Torokhov 2 participants 2 messages Feb 26, 2015 1 message not in the archive

Subsystems (2)
lore
Share & tools
lore

Dmitry Torokhov

author maintainer
#0 lore raw

PATCH 1/1 Input: mma8450 - convert to using managed resources

This simplifies error handling and device removal code. Also let's get rid of setting driver's owner since i2c core does it for us.

---

Note that the following removal was intentional as devm_input_allocate_polled_device() does this for us:

- idev->input->dev.parent = &c->dev;

 drivers/input/misc/mma8450.c | 35 ++++++++---------------------------
 1 file changed, 8 insertions(+), 27 deletions(-)
drivers/input/misc/mma8450.c +8 -27
index 9822877..19c7357 100644
@@ -174,12 +174,13 @@ static int mma8450_probe(struct i2c_client *c,
 	struct mma8450 *m;
 	int err;
 
-	m = kzalloc(sizeof(struct mma8450), GFP_KERNEL);
-	idev = input_allocate_polled_device();
-	if (!m || !idev) {
-		err = -ENOMEM;
-		goto err_free_mem;
-	}
+	m = devm_kzalloc(&c->dev, sizeof(*m), GFP_KERNEL);
+	if (!m)
+		return -ENOMEM;
+
+	idev = devm_input_allocate_polled_device(&c->dev);
+	if (!idev)
+		return -ENOMEM;
 
 	m->client = c;
 	m->idev = idev;
@@ -187,7 +188,6 @@ static int mma8450_probe(struct i2c_client *c,
 	idev->private		= m;
 	idev->input->name	= MMA8450_DRV_NAME;
 	idev->input->id.bustype	= BUS_I2C;
-	idev->input->dev.parent = &c->dev;
 	idev->poll		= mma8450_poll;
 	idev->poll_interval	= POLL_INTERVAL;
 	idev->poll_interval_max	= POLL_INTERVAL_MAX;
@@ -202,29 +202,12 @@ static int mma8450_probe(struct i2c_client *c,
 	err = input_register_polled_device(idev);
 	if (err) {
 		dev_err(&c->dev, "failed to register polled input device\n");
-		goto err_free_mem;
+		return err;
 	}
 
 	i2c_set_clientdata(c, m);
 
 	return 0;
-
-err_free_mem:
-	input_free_polled_device(idev);
-	kfree(m);
-	return err;
-}
-
-static int mma8450_remove(struct i2c_client *c)
-{
-	struct mma8450 *m = i2c_get_clientdata(c);
-	struct input_polled_dev *idev = m->idev;
-
-	input_unregister_polled_device(idev);
-	input_free_polled_device(idev);
-	kfree(m);
-
-	return 0;
 }
 
 static const struct i2c_device_id mma8450_id[] = {
@@ -242,11 +225,9 @@ MODULE_DEVICE_TABLE(of, mma8450_dt_ids);
 static struct i2c_driver mma8450_driver = {
 	.driver = {
 		.name	= MMA8450_DRV_NAME,
-		.owner	= THIS_MODULE,
 		.of_match_table = mma8450_dt_ids,
 	},
 	.probe		= mma8450_probe,
-	.remove		= mma8450_remove,
 	.id_table	= mma8450_id,
 };
 
Signature · 5 lines
2.2.0.rc0.207.ga3a616c


-- 
Dmitry
#2 lore raw
In reply to a message not in the archive

Thanks, tested it and confirming it works them same.

Quoted 113 lines · Stefan Sauer

Thanks, tested it and confirming it works them same.

Quoted 96 lines · Dmitry Torokhov

This simplifies error handling and device removal code. Also let's get rid of setting driver's owner since i2c core does it for us.

---

Note that the following removal was intentional as devm_input_allocate_polled_device() does this for us:

(quoted diff) +0 -1
-       idev->input->dev.parent = &c->dev;
 
 
 drivers/input/misc/mma8450.c | 35 ++++++++---------------------------
 1 file changed, 8 insertions(+), 27 deletions(-)
drivers/input/misc/mma8450.c +8 -25
index 9822877..19c7357 100644
@@ -174,12 +174,13 @@ static int mma8450_probe(struct i2c_client *c,
        struct mma8450 *m;
        int err;
 
-       m = kzalloc(sizeof(struct mma8450), GFP_KERNEL);
-       idev = input_allocate_polled_device();
-       if (!m || !idev) {
-               err = -ENOMEM;
-               goto err_free_mem;
-       }
+       m = devm_kzalloc(&c->dev, sizeof(*m), GFP_KERNEL);
+       if (!m)
+               return -ENOMEM;
+
+       idev = devm_input_allocate_polled_device(&c->dev);
+       if (!idev)
+               return -ENOMEM;
 
        m->client = c;
        m->idev = idev;
@@ -187,7 +188,6 @@ static int mma8450_probe(struct i2c_client *c,
        idev->private           = m;
        idev->input->name       = MMA8450_DRV_NAME;
        idev->input->id.bustype = BUS_I2C;
-       idev->input->dev.parent = &c->dev;
        idev->poll              = mma8450_poll;
        idev->poll_interval     = POLL_INTERVAL;
        idev->poll_interval_max = POLL_INTERVAL_MAX;
@@ -202,29 +202,12 @@ static int mma8450_probe(struct i2c_client *c,
        err = input_register_polled_device(idev);
        if (err) {
                dev_err(&c->dev, "failed to register polled input
 device\n");
-               goto err_free_mem;
+               return err;
        }
 
        i2c_set_clientdata(c, m);
 
        return 0;
-
-err_free_mem:
-       input_free_polled_device(idev);
-       kfree(m);
-       return err;
-}
-
-static int mma8450_remove(struct i2c_client *c)
-{
-       struct mma8450 *m = i2c_get_clientdata(c);
-       struct input_polled_dev *idev = m->idev;
-
-       input_unregister_polled_device(idev);
-       input_free_polled_device(idev);
-       kfree(m);
-
-       return 0;
 }
 

static const struct i2c_device_id mma8450_id[] = {

drivers/input/misc/mma8450.c +0 -3
@@ -242,11 +225,9 @@ MODULE_DEVICE_TABLE(of, mma8450_dt_ids);
 static struct i2c_driver mma8450_driver = {
        .driver = {
                .name   = MMA8450_DRV_NAME,
-               .owner  = THIS_MODULE,
                .of_match_table = mma8450_dt_ids,
        },
        .probe          = mma8450_probe,
-       .remove         = mma8450_remove,
        .id_table       = mma8450_id,
 };
 
--

2.2.0.rc0.207.ga3a616c

Quoted 2 lines

--
Dmitry

--
Stefan Sauer | Software Engineer | [email protected]

Google Germany GmbH | Maximilianstrasse 11-15 | 80539 München | Germany Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschäftsführer: Graham Law, Christine Elizabeth Flores

Signature · 10 lines
Stefan Sauer | Software Engineer | [email protected]

Google Germany GmbH | Maximilianstrasse 11-15 | 80539 München | Germany
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschäftsführer: Graham Law, Christine Elizabeth Flores
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html