reset: gpio: simplify fallback device matching

The of_args field of struct reset_controller_dev was introduced to allow
the reset-gpio driver to pass the phandle arguments back to reset core.
The thing is: it doesn't even have to do it. The core sets the platform
data of the auxiliary device *AND* has access to it later on during the
lookup. This means the field is unneeded and all can happen entirely in
reset core.

Remove the field from the public header and don't set it in
reset-gpio.c. Retrieve the platform data in reset core when needed
instead.

Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>

diff --git a/drivers/reset/core.c b/drivers/reset/core.c
index 3845e77a8d32bf615c9d430847b497af0ba374ad..954df36a242e804b639027384700b8d988be0e90 100644 (file)
--- a/drivers/reset/core.c
+++ b/drivers/reset/core.c
@@ -94,9 +94,6 @@ static const char *rcdev_name(struct reset_controller_dev *rcdev)
        if (rcdev->of_node)
                return rcdev->of_node->full_name;
 
-       if (rcdev->of_args)
-               return rcdev->of_args->np->full_name;
-
        return NULL;
 }
 
@@ -125,9 +122,6 @@ static int of_reset_simple_xlate(struct reset_controller_dev *rcdev,
  */
 int reset_controller_register(struct reset_controller_dev *rcdev)
 {
-       if (rcdev->of_node && rcdev->of_args)
-               return -EINVAL;
-
        if (!rcdev->of_xlate) {
                rcdev->of_reset_n_cells = 1;
                rcdev->of_xlate = of_reset_simple_xlate;
@@ -1006,13 +1000,16 @@ static struct reset_controller_dev *__reset_find_rcdev(const struct of_phandle_a
                                                       bool gpio_fallback)
 {
        struct reset_controller_dev *rcdev;
+       struct of_phandle_args *rc_args;
 
        lockdep_assert_held(&reset_list_mutex);
 
        list_for_each_entry(rcdev, &reset_controller_list, list) {
-               if (gpio_fallback) {
-                       if (rcdev->of_args && of_phandle_args_equal(args,
-                                                                   rcdev->of_args))
+               if (gpio_fallback && rcdev->dev &&
+                   device_is_compatible(rcdev->dev, "reset-gpio")) {
+                       rc_args = dev_get_platdata(rcdev->dev);
+
+                       if (of_phandle_args_equal(args, rc_args))
                                return rcdev;
                } else {
                        if (args->np == rcdev->of_node)

diff --git a/drivers/reset/reset-gpio.c b/drivers/reset/reset-gpio.c
index ad5bfe27aaef7de57f9566330253333aa2b1253f..6e1c4f990bc0e54f4a47186340cef03b1a2ee29b 100644 (file)
--- a/drivers/reset/reset-gpio.c
+++ b/drivers/reset/reset-gpio.c
@@ -56,12 +56,8 @@ static int reset_gpio_probe(struct auxiliary_device *adev,
                            const struct auxiliary_device_id *id)
 {
        struct device *dev = &adev->dev;
-       struct of_phandle_args *platdata = dev_get_platdata(dev);
        struct reset_gpio_priv *priv;
 
-       if (!platdata)
-               return -EINVAL;
-
        priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
        if (!priv)
                return -ENOMEM;
@@ -76,7 +72,6 @@ static int reset_gpio_probe(struct auxiliary_device *adev,
        priv->rc.ops = &reset_gpio_ops;
        priv->rc.owner = THIS_MODULE;
        priv->rc.dev = dev;
-       priv->rc.of_args = platdata;
 
        /* Cells to match GPIO specifier, but it's not really used */
        priv->rc.of_reset_n_cells = 2;

diff --git a/include/linux/reset-controller.h b/include/linux/reset-controller.h
index 46514cb1b9e0626872fe71357b24d54ff0e81a8b..aa95b460fdf86f10002a465e285cd0119da6eeaf 100644 (file)
--- a/include/linux/reset-controller.h
+++ b/include/linux/reset-controller.h
@@ -35,9 +35,6 @@ struct of_phandle_args;
  * @reset_control_head: head of internal list of requested reset controls
  * @dev: corresponding driver model device struct
  * @of_node: corresponding device tree node as phandle target
- * @of_args: for reset-gpios controllers: corresponding phandle args with
- *           of_node and GPIO number complementing of_node; either this or
- *           of_node should be present
  * @of_reset_n_cells: number of cells in reset line specifiers
  * @of_xlate: translation function to translate from specifier as found in the
  *            device tree to id as given to the reset control ops, defaults
@@ -51,7 +48,6 @@ struct reset_controller_dev {
        struct list_head reset_control_head;
        struct device *dev;
        struct device_node *of_node;
-       const struct of_phandle_args *of_args;
        int of_reset_n_cells;
        int (*of_xlate)(struct reset_controller_dev *rcdev,
                        const struct of_phandle_args *reset_spec);