For rmi_sensor and rmi_function device_types, use put_device() and
the assocated device_type.release() function to clean up related
structures and storage in the correct and safe order.
Signed-off-by: Christopher Heiny <cheiny@xxxxxxxxxxxxx>
Cc: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
Cc: Benjamin Tissoires <benjamin.tissoires@xxxxxxxxxx>
Cc: Linux Walleij <linus.walleij@xxxxxxxxxx>
Cc: David Herrmann <dh.herrmann@xxxxxxxxx>
Cc: Jiri Kosina <jkosina@xxxxxxx>
Cc: Courtney Cavin <courtney.cavin@xxxxxxxxxxxxxx>
---
drivers/input/rmi4/rmi_bus.c | 65 +++++++++++++++--------------------------
drivers/input/rmi4/rmi_driver.c | 11 ++-----
2 files changed, 25 insertions(+), 51 deletions(-)
diff --git a/drivers/input/rmi4/rmi_bus.c b/drivers/input/rmi4/rmi_bus.c
index 96a76e7..1b9ad80 100644
--- a/drivers/input/rmi4/rmi_bus.c
+++ b/drivers/input/rmi4/rmi_bus.c
@@ -30,23 +30,6 @@ static struct dentry *rmi_debugfs_root;
* purpose. For example F11 is a 2D touch sensor while F01 is a generic
* function present in every RMI device.
*/
-
-static void rmi_release_device(struct device *dev)
-{
- struct rmi_device *rmi_dev = to_rmi_device(dev);
- kfree(rmi_dev);
-}
-
-struct device_type rmi_device_type = {
- .name = "rmi_sensor",
- .release = rmi_release_device,
-};
-
-bool rmi_is_physical_device(struct device *dev)
-{
- return dev->type == &rmi_device_type;
-}
-
#ifdef CONFIG_RMI4_DEBUG
static void rmi_physical_setup_debugfs(struct rmi_device *rmi_dev)
@@ -94,8 +77,7 @@ int rmi_register_transport_device(struct rmi_transport_dev *xport)
return -EINVAL;
}
- rmi_dev = devm_kzalloc(xport->dev,
- sizeof(struct rmi_device), GFP_KERNEL);
+ rmi_dev = kzalloc(sizeof(struct rmi_device), GFP_KERNEL);
if (!rmi_dev)
return -ENOMEM;
@@ -112,8 +94,10 @@ int rmi_register_transport_device(struct rmi_transport_dev *xport)
rmi_physical_setup_debugfs(rmi_dev);
error = device_register(&rmi_dev->dev);
- if (error)
+ if (error) {
+ put_device(&rmi_dev->dev);
return error;
+ }
dev_dbg(xport->dev, "%s: Registered %s as %s.\n", __func__,
pdata->sensor_name, dev_name(&rmi_dev->dev));
@@ -131,7 +115,6 @@ void rmi_unregister_transport_device(struct rmi_transport_dev *xport)
{
struct rmi_device *rmi_dev = xport->rmi_dev;
- rmi_physical_teardown_debugfs(rmi_dev);
device_unregister(&rmi_dev->dev);
}
EXPORT_SYMBOL(rmi_unregister_transport_device);
@@ -139,21 +122,6 @@ EXPORT_SYMBOL(rmi_unregister_transport_device);
/* Function specific stuff */
-static void rmi_release_function(struct device *dev)
-{
- struct rmi_function *fn = to_rmi_function(dev);
- kfree(fn);
-}
-
-struct device_type rmi_function_type = {
- .name = "rmi_function",
- .release = rmi_release_function,
-};
-
-bool rmi_is_function_device(struct device *dev)
-{
- return dev->type == &rmi_function_type;
-}
#ifdef CONFIG_RMI4_DEBUG
@@ -185,6 +153,23 @@ static void rmi_function_teardown_debugfs(struct rmi_function *fn)
}
#endif
+static void rmi_release_function(struct device *dev)
+{
+ struct rmi_function *fn = to_rmi_function(dev);
+ rmi_function_teardown_debugfs(fn);
+ kfree(fn->irq_mask);
+ kfree(fn);
+}
+
+struct device_type rmi_function_type = {
+ .name = "rmi_function",
+ .release = rmi_release_function,
+};
+
+bool rmi_is_function_device(struct device *dev)
+{
+ return dev->type == &rmi_function_type;
+}
static int rmi_function_match(struct device *dev, struct device_driver *drv)
{
@@ -240,21 +225,17 @@ int rmi_register_function(struct rmi_function *fn)
dev_err(&rmi_dev->dev,
"Failed device_register function device %s\n",
dev_name(&fn->dev));
- goto error_exit;
+ put_device(&fn->dev);
+ return error;
}
dev_dbg(&rmi_dev->dev, "Registered F%02X.\n", fn->fd.function_number);
return 0;
-
-error_exit:
- rmi_function_teardown_debugfs(fn);
- return error;
}
void rmi_unregister_function(struct rmi_function *fn)
{
- rmi_function_teardown_debugfs(fn);
device_unregister(&fn->dev);
}
diff --git a/drivers/input/rmi4/rmi_driver.c b/drivers/input/rmi4/rmi_driver.c
index 34f19e9..43575a1 100644
--- a/drivers/input/rmi4/rmi_driver.c
+++ b/drivers/input/rmi4/rmi_driver.c
@@ -674,8 +674,7 @@ static int rmi_create_function(struct rmi_device *rmi_dev,
if (!fn->irq_mask) {
dev_err(dev, "%s: Failed to create irq_mask for F%02X.\n",
__func__, pdt->function_number);
- error = -ENOMEM;
- goto err_free_mem;
+ return -ENOMEM;
}
for (i = 0; i < fn->num_of_irqs; i++)
@@ -683,7 +682,7 @@ static int rmi_create_function(struct rmi_device *rmi_dev,
error = rmi_register_function(fn);
if (error)
- goto err_free_irq_mask;
+ return error;
if (pdt->function_number == 0x01)
data->f01_container = fn;
@@ -691,12 +690,6 @@ static int rmi_create_function(struct rmi_device *rmi_dev,
list_add_tail(&fn->node, &data->function_list);
return RMI_SCAN_CONTINUE;
-
-err_free_irq_mask:
- kfree(fn->irq_mask);
-err_free_mem:
- kfree(fn);
- return error;
}
#ifdef CONFIG_PM_SLEEP
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
