Received-SPF: pass (google.com: domain of linux-kernel+bounces-207928-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Message-ID: <78fdc86f1957da67963740711054265abc878998.camel@gmail.com>
Subject: Re: [PATCH 2/3] Input: adxl34x - switch to using managed resources
From: Nuno =?ISO-8859-1?Q?S=E1?= <noname.nuno@gmail.com>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>, linux-input@vger.kernel.org
Cc: Michael Hennerich <michael.hennerich@analog.com>, 
	linux-kernel@vger.kernel.org
Date: Mon, 10 Jun 2024 11:25:11 +0200
In-Reply-To: <20240609234122.603796-2-dmitry.torokhov@gmail.com>
References: <20240609234122.603796-1-dmitry.torokhov@gmail.com>
	 <20240609234122.603796-2-dmitry.torokhov@gmail.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.52.2 
Precedence: bulk
MIME-Version: 1.0

On Sun, 2024-06-09 at 16:41 -0700, Dmitry Torokhov wrote:
> Switch the driver to use managed resources to simplify error handling.
>=20
> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
> ---
> =C2=A0drivers/input/misc/adxl34x-i2c.c |=C2=A0 8 ---
> =C2=A0drivers/input/misc/adxl34x-spi.c |=C2=A0 8 ---
> =C2=A0drivers/input/misc/adxl34x.c=C2=A0=C2=A0=C2=A0=C2=A0 | 85 +++++++++=
++---------------------
> =C2=A0drivers/input/misc/adxl34x.h=C2=A0=C2=A0=C2=A0=C2=A0 |=C2=A0 1 -
> =C2=A04 files changed, 30 insertions(+), 72 deletions(-)
>=20
> diff --git a/drivers/input/misc/adxl34x-i2c.c b/drivers/input/misc/adxl34=
x-
> i2c.c
> index 7531c7b2d657..c05d898898e8 100644
> --- a/drivers/input/misc/adxl34x-i2c.c
> +++ b/drivers/input/misc/adxl34x-i2c.c
> @@ -98,13 +98,6 @@ static int adxl34x_i2c_probe(struct i2c_client *client=
)
> =C2=A0	return 0;
> =C2=A0}
> =C2=A0
> -static void adxl34x_i2c_remove(struct i2c_client *client)
> -{
> -	struct adxl34x *ac =3D i2c_get_clientdata(client);
> -
> -	adxl34x_remove(ac);
> -}
> -
> =C2=A0static const struct i2c_device_id adxl34x_id[] =3D {
> =C2=A0	{ "adxl34x" },
> =C2=A0	{ }
> @@ -137,7 +130,6 @@ static struct i2c_driver adxl34x_driver =3D {
> =C2=A0		.of_match_table =3D adxl34x_of_id,
> =C2=A0	},
> =C2=A0	.probe=C2=A0=C2=A0=C2=A0 =3D adxl34x_i2c_probe,
> -	.remove=C2=A0=C2=A0 =3D adxl34x_i2c_remove,
> =C2=A0	.id_table =3D adxl34x_id,
> =C2=A0};
> =C2=A0
> diff --git a/drivers/input/misc/adxl34x-spi.c b/drivers/input/misc/adxl34=
x-
> spi.c
> index 2befcc4df0be..fd716d861832 100644
> --- a/drivers/input/misc/adxl34x-spi.c
> +++ b/drivers/input/misc/adxl34x-spi.c
> @@ -87,13 +87,6 @@ static int adxl34x_spi_probe(struct spi_device *spi)
> =C2=A0	return 0;
> =C2=A0}
> =C2=A0
> -static void adxl34x_spi_remove(struct spi_device *spi)
> -{
> -	struct adxl34x *ac =3D spi_get_drvdata(spi);
> -
> -	adxl34x_remove(ac);
> -}
> -
> =C2=A0static struct spi_driver adxl34x_driver =3D {
> =C2=A0	.driver =3D {
> =C2=A0		.name =3D "adxl34x",
> @@ -101,7 +94,6 @@ static struct spi_driver adxl34x_driver =3D {
> =C2=A0		.pm =3D pm_sleep_ptr(&adxl34x_pm),
> =C2=A0	},
> =C2=A0	.probe=C2=A0=C2=A0 =3D adxl34x_spi_probe,
> -	.remove=C2=A0 =3D adxl34x_spi_remove,
> =C2=A0};
> =C2=A0
> =C2=A0module_spi_driver(adxl34x_driver);
> diff --git a/drivers/input/misc/adxl34x.c b/drivers/input/misc/adxl34x.c
> index fbe5a56c19d1..c6c34005f5d2 100644
> --- a/drivers/input/misc/adxl34x.c
> +++ b/drivers/input/misc/adxl34x.c
> @@ -707,21 +707,21 @@ struct adxl34x *adxl34x_probe(struct device *dev, i=
nt
> irq,
> =C2=A0	struct adxl34x *ac;
> =C2=A0	struct input_dev *input_dev;
> =C2=A0	const struct adxl34x_platform_data *pdata;
> -	int err, range, i;
> +	int error, range, i;
> =C2=A0	int revid;
> =C2=A0
> =C2=A0	if (!irq) {
> =C2=A0		dev_err(dev, "no IRQ?\n");
> -		err =3D -ENODEV;
> -		goto err_out;
> +		return ERR_PTR(-ENODEV);
> =C2=A0	}
> =C2=A0
> -	ac =3D kzalloc(sizeof(*ac), GFP_KERNEL);
> -	input_dev =3D input_allocate_device();
> -	if (!ac || !input_dev) {
> -		err =3D -ENOMEM;
> -		goto err_free_mem;
> -	}
> +	ac =3D devm_kzalloc(dev, sizeof(*ac), GFP_KERNEL);
> +	if (!ac)
> +		return ERR_PTR(-ENOMEM);
> +
> +	input_dev =3D devm_input_allocate_device(dev);
> +	if (!input_dev)
> +		return ERR_PTR(-ENOMEM);
> =C2=A0
> =C2=A0	ac->fifo_delay =3D fifo_delay_default;
> =C2=A0
> @@ -754,14 +754,12 @@ struct adxl34x *adxl34x_probe(struct device *dev, i=
nt
> irq,
> =C2=A0		break;
> =C2=A0	default:
> =C2=A0		dev_err(dev, "Failed to probe %s\n", input_dev->name);
> -		err =3D -ENODEV;
> -		goto err_free_mem;
> +		return ERR_PTR(-ENODEV);
> =C2=A0	}
> =C2=A0
> =C2=A0	snprintf(ac->phys, sizeof(ac->phys), "%s/input0", dev_name(dev));
> =C2=A0
> =C2=A0	input_dev->phys =3D ac->phys;
> -	input_dev->dev.parent =3D dev;
> =C2=A0	input_dev->id.product =3D ac->model;
> =C2=A0	input_dev->id.bustype =3D bops->bustype;
> =C2=A0	input_dev->open =3D adxl34x_input_open;
> @@ -769,18 +767,12 @@ struct adxl34x *adxl34x_probe(struct device *dev, i=
nt
> irq,
> =C2=A0
> =C2=A0	input_set_drvdata(input_dev, ac);
> =C2=A0
> -	__set_bit(ac->pdata.ev_type, input_dev->evbit);
> -
> =C2=A0	if (ac->pdata.ev_type =3D=3D EV_REL) {
> -		__set_bit(REL_X, input_dev->relbit);
> -		__set_bit(REL_Y, input_dev->relbit);
> -		__set_bit(REL_Z, input_dev->relbit);
> +		input_set_capability(input_dev, EV_REL, REL_X);
> +		input_set_capability(input_dev, EV_REL, REL_Y);
> +		input_set_capability(input_dev, EV_REL, REL_Z);
> =C2=A0	} else {
> =C2=A0		/* EV_ABS */
> -		__set_bit(ABS_X, input_dev->absbit);
> -		__set_bit(ABS_Y, input_dev->absbit);
> -		__set_bit(ABS_Z, input_dev->absbit);

Are these somehow default or already set? I guess in input_set_abs_params()=
...
Anyways, the move from "raw" __set_bits() to input APIs should maybe be don=
e in
a separate patch? They are unrelated with the current one.

- Nuno S=C3=A1=20