| Message ID | 20240825051627.2848495-9-dmitry.torokhov@gmail.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 22df24590f56e2a8d6d2f428448d9bfd2fcf48ee |
| Headers | show |
| Series | Convert keyboard drivers to use new cleanup facilities | expand |
Hi Dmitry, On Sat, Aug 24, 2024 at 10:16:12PM -0700, Dmitry Torokhov wrote: > Use __free(fwnode_handle) cleanup facility to ensure that references > to acquired fwnodes are dropped at appropriate times automatically. > > Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Reviewed-by: Jeff LaBundy <jeff@labundy.com> > --- > drivers/input/keyboard/iqs62x-keys.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/drivers/input/keyboard/iqs62x-keys.c b/drivers/input/keyboard/iqs62x-keys.c > index 688d61244b5f..1315b0f0862f 100644 > --- a/drivers/input/keyboard/iqs62x-keys.c > +++ b/drivers/input/keyboard/iqs62x-keys.c > @@ -45,7 +45,6 @@ struct iqs62x_keys_private { > static int iqs62x_keys_parse_prop(struct platform_device *pdev, > struct iqs62x_keys_private *iqs62x_keys) > { > - struct fwnode_handle *child; > unsigned int val; > int ret, i; > > @@ -68,7 +67,8 @@ static int iqs62x_keys_parse_prop(struct platform_device *pdev, > } > > for (i = 0; i < ARRAY_SIZE(iqs62x_keys->switches); i++) { > - child = device_get_named_child_node(&pdev->dev, > + struct fwnode_handle *child __free(fwnode_handle) = > + device_get_named_child_node(&pdev->dev, > iqs62x_switch_names[i]); > if (!child) > continue; > @@ -77,7 +77,6 @@ static int iqs62x_keys_parse_prop(struct platform_device *pdev, > if (ret) { > dev_err(&pdev->dev, "Failed to read switch code: %d\n", > ret); > - fwnode_handle_put(child); > return ret; > } > iqs62x_keys->switches[i].code = val; > @@ -91,8 +90,6 @@ static int iqs62x_keys_parse_prop(struct platform_device *pdev, > iqs62x_keys->switches[i].flag = (i == IQS62X_SW_HALL_N ? > IQS62X_EVENT_HALL_N_T : > IQS62X_EVENT_HALL_S_T); > - > - fwnode_handle_put(child); > } > > return 0; > -- > 2.46.0.295.g3b9ea8a38a-goog > Kind regards, Jeff LaBundy
diff --git a/drivers/input/keyboard/iqs62x-keys.c b/drivers/input/keyboard/iqs62x-keys.c index 688d61244b5f..1315b0f0862f 100644 --- a/drivers/input/keyboard/iqs62x-keys.c +++ b/drivers/input/keyboard/iqs62x-keys.c @@ -45,7 +45,6 @@ struct iqs62x_keys_private { static int iqs62x_keys_parse_prop(struct platform_device *pdev, struct iqs62x_keys_private *iqs62x_keys) { - struct fwnode_handle *child; unsigned int val; int ret, i; @@ -68,7 +67,8 @@ static int iqs62x_keys_parse_prop(struct platform_device *pdev, } for (i = 0; i < ARRAY_SIZE(iqs62x_keys->switches); i++) { - child = device_get_named_child_node(&pdev->dev, + struct fwnode_handle *child __free(fwnode_handle) = + device_get_named_child_node(&pdev->dev, iqs62x_switch_names[i]); if (!child) continue; @@ -77,7 +77,6 @@ static int iqs62x_keys_parse_prop(struct platform_device *pdev, if (ret) { dev_err(&pdev->dev, "Failed to read switch code: %d\n", ret); - fwnode_handle_put(child); return ret; } iqs62x_keys->switches[i].code = val; @@ -91,8 +90,6 @@ static int iqs62x_keys_parse_prop(struct platform_device *pdev, iqs62x_keys->switches[i].flag = (i == IQS62X_SW_HALL_N ? IQS62X_EVENT_HALL_N_T : IQS62X_EVENT_HALL_S_T); - - fwnode_handle_put(child); } return 0;
Use __free(fwnode_handle) cleanup facility to ensure that references to acquired fwnodes are dropped at appropriate times automatically. Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> --- drivers/input/keyboard/iqs62x-keys.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)