Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   "Hennerich, Michael" <Michael.Hennerich@analog.com>
To:     Dmitry Torokhov <dmitry.torokhov@gmail.com>
CC:     =?iso-8859-1?Q?Uwe_Kleine-K=F6nig?= 
        <u.kleine-koenig@pengutronix.de>,
        "linux-input@vger.kernel.org" <linux-input@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: [PATCH 3/4] Input: adp5588-keys - switch to using managed
 resources
Thread-Topic: [PATCH 3/4] Input: adp5588-keys - switch to using managed
 resources
Thread-Index: AQHYck9TY0Z3n8JQbUawF7Y5LRKwJK03NnoQ
Date:   Mon, 30 May 2022 10:11:09 +0000
Message-ID: <SJ0PR03MB625362C81843C51A26448A418EDD9@SJ0PR03MB6253.namprd03.prod.outlook.com>
References: <20220528045631.289821-1-dmitry.torokhov@gmail.com>
 <20220528045631.289821-3-dmitry.torokhov@gmail.com>
In-Reply-To: <20220528045631.289821-3-dmitry.torokhov@gmail.com>
Accept-Language: de-DE, en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?OzwkWCcoZM93fHasg18El9654ZKF8zf0hJJPZPYPAtoAhDj6/ZtdqrLa1b?=
 =?iso-8859-1?Q?PZSH4jgJToeZqWqoOGmv8+z/qMTv0k/GNDOlyoYTuP5VzerzV6u6E9swDF?=
 =?iso-8859-1?Q?lRQ8e+Pn5/KtkTLGK72LaTnWJ26RcNQ9ohnxPqZp0tDxlE9dzD6lmjQvwe?=
 =?iso-8859-1?Q?+A65JkM3mSWhuNh9Pw+j5CxEGqn+182T3Hat5/Q7uNZGf983hE9zusW8k+?=
 =?iso-8859-1?Q?LyVbOVHb7kixpoUgXTTrosrwQ/cO03Va2TCVdcbS4CWUKW7txgSbGpS8e4?=
 =?iso-8859-1?Q?NwMadBiJw3IXXgyv4WcAPCxU8mx96vOVyLF5EhSDEBK3Vyw3AzN0KxfQzA?=
 =?iso-8859-1?Q?tRbO1gIbAl9udWfcGE09HYJ6ZL4xdvsHJrqvmMsWVomEZzFdZvCZkgs7OP?=
 =?iso-8859-1?Q?rlrsxLRJ6tctPktYuPY9i5npPxIh1hwtOuS2lcszxSx6GUd4mLexgAh7jZ?=
 =?iso-8859-1?Q?bJmWy5jRA0zfdWYXFHT4+H8QmlJ/qoAZUFBhAOKlWsk4PkcamKh6R3M8FX?=
 =?iso-8859-1?Q?8vc8+pb2dYbEUtn6tu3c0AMReRGdAEn8wFgr1n2QeokZxgpVg3vb1u+Y+Q?=
 =?iso-8859-1?Q?eWS39GvrHjjm72YvCtfJJc6X3k6FRhf/qvNvJanKP1ei7btdLLVaShBhWX?=
 =?iso-8859-1?Q?/uKk53T0nnXqx0vtjCrXcdAnYo3Jd4WfKp5HD5q55/7MUxGIslwZWeazT0?=
 =?iso-8859-1?Q?rNLz0L57A4X/wAoAzPi+o8sW934SYFlmKqECJwKFyLOv3BqOC2EdyAARq0?=
 =?iso-8859-1?Q?yC1/6lGVAtN26totB/3n7GfKZy2msRbrWbaPnctjFNgm43fZFyNd0uggEm?=
 =?iso-8859-1?Q?hrLIJG9UBaXyavPAfuqeUOSPbhLG5nF9tENkUf7VLLBM2sphorpeXS7c2b?=
 =?iso-8859-1?Q?zfvGXTAIvW9ofqFhRRGxGVU3kfaOxATTVxjZlkp3qnAGpHrlyxSA858yV+?=
 =?iso-8859-1?Q?nyPKk6eCJHFibPiGFA35QGYkMG1l8sUscJuXgUPSZ+CREsLtdEWwxaU9qg?=
 =?iso-8859-1?Q?kLcXF77vfNCS7KqVZqt1xDLALnqoxTP9nsOafL5wCPnpAyy4YLflzKkmeE?=
 =?iso-8859-1?Q?+y4QFTe2unb3LN9NFZvQatL2JwtNwkGr9fs3z0iMm9kjlpPBPgp16OboxY?=
 =?iso-8859-1?Q?gi+AeF6TFtyN8g5UTa7ICbVwc7CBiE3Q30wgktO9tqNf0avUwOk5tcgSsx?=
 =?iso-8859-1?Q?pZcva8Ly5iaZ7EfM5iJw3D/oIVBGOk9thvyp+BrLn57EcMMFCcj7ymZCEQ?=
 =?iso-8859-1?Q?l+F2H6RvryNdiqkJgFRyYAGNVmizxXAA0QG02nksZiJECP9nJVjEm/SE5C?=
 =?iso-8859-1?Q?7z7QeTQnW5BIiAwaCg8lMqTRRQ331Wr3JRx+V60Nx7gK/SMK4WEWyMlbZ3?=
 =?iso-8859-1?Q?NdL5j2yiwtI0qah6zaTsLMyTMjmN5D28aWWqJRio2siqZsVhTjQ5jAQdeR?=
 =?iso-8859-1?Q?STCRuOEgF96VQpsqcPbkYUw/pnB49Uw14wWHUBa5dsIb1QT8No1Snd8Wv1?=
 =?iso-8859-1?Q?Ixes5PfE3NO42VX3+44EJhjAo6HLr6rpeC2VtnM3gonCBccCJBFlF1jBdA?=
 =?iso-8859-1?Q?OveEyhnEKN5JN9/rdGO5Jnw6FPvzL+sRYP6Zqt5f7fnACfbL8t8lMOjWOI?=
 =?iso-8859-1?Q?gFzNA9/k8rr31sbqH21Ip9vgDWS9Nnfx3gsfBUkbz2oTtU2kXAyGHMzgp0?=
 =?iso-8859-1?Q?NCBILWeUlY0VD+UvN/kH8vHwFqs0bFpje62NkQ1qfdTQgt3Qk1MEb2qaIA?=
 =?iso-8859-1?Q?3Kwcb5UsYmSdcX99bCOyr6x+74MjPsP+nen1LGwvH2wE8BIfXH5kYhPUa2?=
 =?iso-8859-1?Q?0XbPA6AhMQRfjjJIygcLIF8sGubUHtY=3D?=
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-OriginatorOrg: analog.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: SJ0PR03MB6253.namprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 88cfb21c-69f7-40b2-3d60-08da4224b784
X-MS-Exchange-CrossTenant-originalarrivaltime: 30 May 2022 10:11:09.1343
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: eaa689b4-8f87-40e0-9c6f-7228de4d754a
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: 646WnuXzq83T6YF0TPl7gygZwVCGNdUJegtsqQuSP6TBKYqMBAmO0cB89zGA5WgA8C355Km8FoJmVxKOgjk1z9QLuJBnqOSth2ZSJGWObPA=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR03MB2920
X-Proofpoint-GUID: Mb51nyjF5WJbZkfueguToaksmF84zPn1
X-Proofpoint-ORIG-GUID: Mb51nyjF5WJbZkfueguToaksmF84zPn1
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.205,Aquarius:18.0.874,Hydra:6.0.486,FMLib:17.11.64.514
 definitions=2022-05-30_03,2022-05-30_01,2022-02-23_01
X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 lowpriorityscore=0
 phishscore=0 clxscore=1015 spamscore=0 malwarescore=0 adultscore=0
 bulkscore=0 priorityscore=1501 impostorscore=0 suspectscore=0
 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2204290000 definitions=main-2205300054
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


> -----Original Message-----
> From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> Sent: Samstag, 28. Mai 2022 06:57
> To: Hennerich, Michael <Michael.Hennerich@analog.com>
> Cc: Uwe Kleine-K=F6nig <u.kleine-koenig@pengutronix.de>; linux-
> input@vger.kernel.org; linux-kernel@vger.kernel.org
> Subject: [PATCH 3/4] Input: adp5588-keys - switch to using managed resour=
ces
>=20
>=20
> This simplifies error handling in probe() and reduces amount of explicit =
code in
> remove().
>=20
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>

Acked-by: Michael Hennerich <michael.hennerich@analog.com>

> ---
>  drivers/input/keyboard/adp5588-keys.c | 111 +++++++++++---------------
>  1 file changed, 45 insertions(+), 66 deletions(-)
>=20
> diff --git a/drivers/input/keyboard/adp5588-keys.c
> b/drivers/input/keyboard/adp5588-keys.c
> index ac21873ba1d7..df84a2998ed2 100644
> --- a/drivers/input/keyboard/adp5588-keys.c
> +++ b/drivers/input/keyboard/adp5588-keys.c
> @@ -182,6 +182,21 @@ static int adp5588_build_gpiomap(struct
> adp5588_kpad *kpad,
>  	return n_unused;
>  }
>=20
> +static void adp5588_gpio_do_teardown(void *_kpad) {
> +	struct adp5588_kpad *kpad =3D _kpad;
> +	struct device *dev =3D &kpad->client->dev;
> +	const struct adp5588_kpad_platform_data *pdata =3D
> dev_get_platdata(dev);
> +	const struct adp5588_gpio_platform_data *gpio_data =3D pdata-
> >gpio_data;
> +	int error;
> +
> +	error =3D gpio_data->teardown(kpad->client,
> +				    kpad->gc.base, kpad->gc.ngpio,
> +				    gpio_data->context);
> +	if (error)
> +		dev_warn(&kpad->client->dev, "teardown failed %d\n", error);
> }
> +
>  static int adp5588_gpio_add(struct adp5588_kpad *kpad)  {
>  	struct device *dev =3D &kpad->client->dev; @@ -198,8 +213,6 @@ static
> int adp5588_gpio_add(struct adp5588_kpad *kpad)
>  		return 0;
>  	}
>=20
> -	kpad->export_gpio =3D true;
> -
>  	kpad->gc.direction_input =3D adp5588_gpio_direction_input;
>  	kpad->gc.direction_output =3D adp5588_gpio_direction_output;
>  	kpad->gc.get =3D adp5588_gpio_get_value; @@ -213,9 +226,9 @@ static
> int adp5588_gpio_add(struct adp5588_kpad *kpad)
>=20
>  	mutex_init(&kpad->gpio_lock);
>=20
> -	error =3D gpiochip_add_data(&kpad->gc, kpad);
> +	error =3D devm_gpiochip_add_data(dev, &kpad->gc, kpad);
>  	if (error) {
> -		dev_err(dev, "gpiochip_add failed, err: %d\n", error);
> +		dev_err(dev, "gpiochip_add failed: %d\n", error);
>  		return error;
>  	}
>=20
> @@ -230,41 +243,24 @@ static int adp5588_gpio_add(struct adp5588_kpad
> *kpad)
>  					 kpad->gc.base, kpad->gc.ngpio,
>  					 gpio_data->context);
>  		if (error)
> -			dev_warn(dev, "setup failed, %d\n", error);
> +			dev_warn(dev, "setup failed: %d\n", error);
>  	}
>=20
> -	return 0;
> -}
> -
> -static void adp5588_gpio_remove(struct adp5588_kpad *kpad) -{
> -	struct device *dev =3D &kpad->client->dev;
> -	const struct adp5588_kpad_platform_data *pdata =3D
> dev_get_platdata(dev);
> -	const struct adp5588_gpio_platform_data *gpio_data =3D pdata-
> >gpio_data;
> -	int error;
> -
> -	if (!kpad->export_gpio)
> -		return;
> -
>  	if (gpio_data->teardown) {
> -		error =3D gpio_data->teardown(kpad->client,
> -					    kpad->gc.base, kpad->gc.ngpio,
> -					    gpio_data->context);
> +		error =3D devm_add_action(dev, adp5588_gpio_do_teardown,
> kpad);
>  		if (error)
> -			dev_warn(dev, "teardown failed %d\n", error);
> +			dev_warn(dev, "failed to schedule teardown: %d\n",
> +				 error);
>  	}
>=20
> -	gpiochip_remove(&kpad->gc);
> +	return 0;
>  }
> +
>  #else
>  static inline int adp5588_gpio_add(struct adp5588_kpad *kpad)  {
>  	return 0;
>  }
> -
> -static inline void adp5588_gpio_remove(struct adp5588_kpad *kpad) -{ -}
> #endif
>=20
>  static void adp5588_report_events(struct adp5588_kpad *kpad, int ev_cnt)
> @@ -510,21 +506,20 @@ static int adp5588_probe(struct i2c_client *client,
>  		return -EINVAL;
>  	}
>=20
> -	kpad =3D kzalloc(sizeof(*kpad), GFP_KERNEL);
> -	input =3D input_allocate_device();
> -	if (!kpad || !input) {
> -		error =3D -ENOMEM;
> -		goto err_free_mem;
> -	}
> +	kpad =3D devm_kzalloc(&client->dev, sizeof(*kpad), GFP_KERNEL);
> +	if (!kpad)
> +		return -ENOMEM;
> +
> +	input =3D devm_input_allocate_device(&client->dev);
> +	if (!input)
> +		return -ENOMEM;
>=20
>  	kpad->client =3D client;
>  	kpad->input =3D input;
>=20
>  	ret =3D adp5588_read(client, DEV_ID);
> -	if (ret < 0) {
> -		error =3D ret;
> -		goto err_free_mem;
> -	}
> +	if (ret < 0)
> +		return ret;
>=20
>  	revid =3D (u8) ret & ADP5588_DEVICE_ID_MASK;
>  	if (WA_DELAYED_READOUT_REVID(revid))
> @@ -532,7 +527,6 @@ static int adp5588_probe(struct i2c_client *client,
>=20
>  	input->name =3D client->name;
>  	input->phys =3D "adp5588-keys/input0";
> -	input->dev.parent =3D &client->dev;
>=20
>  	input_set_drvdata(input, kpad);
>=20
> @@ -569,58 +563,43 @@ static int adp5588_probe(struct i2c_client *client,
>=20
>  	error =3D input_register_device(input);
>  	if (error) {
> -		dev_err(&client->dev, "unable to register input device\n");
> -		goto err_free_mem;
> +		dev_err(&client->dev, "unable to register input device: %d\n",
> +			error);
> +		return error;
>  	}
>=20
> -	error =3D request_threaded_irq(client->irq,
> -				     adp5588_hard_irq, adp5588_thread_irq,
> -				     IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
> -				     client->dev.driver->name, kpad);
> +	error =3D devm_request_threaded_irq(&client->dev, client->irq,
> +					  adp5588_hard_irq,
> adp5588_thread_irq,
> +					  IRQF_TRIGGER_FALLING |
> IRQF_ONESHOT,
> +					  client->dev.driver->name, kpad);
>  	if (error) {
> -		dev_err(&client->dev, "irq %d busy?\n", client->irq);
> -		goto err_unreg_dev;
> +		dev_err(&client->dev, "failed to request irq %d: %d\n",
> +			client->irq, error);
> +		return error;
>  	}
>=20
>  	error =3D adp5588_setup(client);
>  	if (error)
> -		goto err_free_irq;
> +		return error;
>=20
>  	if (kpad->gpimapsize)
>  		adp5588_report_switch_state(kpad);
>=20
>  	error =3D adp5588_gpio_add(kpad);
>  	if (error)
> -		goto err_free_irq;
> +		return error;
>=20
>  	device_init_wakeup(&client->dev, 1);
> -	i2c_set_clientdata(client, kpad);
>=20
>  	dev_info(&client->dev, "Rev.%d keypad, irq %d\n", revid, client->irq);
>  	return 0;
> -
> - err_free_irq:
> -	free_irq(client->irq, kpad);
> - err_unreg_dev:
> -	input_unregister_device(input);
> -	input =3D NULL;
> - err_free_mem:
> -	input_free_device(input);
> -	kfree(kpad);
> -
> -	return error;
>  }
>=20
>  static int adp5588_remove(struct i2c_client *client)  {
> -	struct adp5588_kpad *kpad =3D i2c_get_clientdata(client);
> -
>  	adp5588_write(client, CFG, 0);
> -	free_irq(client->irq, kpad);
> -	input_unregister_device(kpad->input);
> -	adp5588_gpio_remove(kpad);
> -	kfree(kpad);
>=20
> +	/* all resources will be freed by devm */
>  	return 0;
>  }
>=20
> --
> 2.36.1.124.g0e6072fb45-goog