Date:   Fri, 10 Mar 2023 07:14:45 -0500
From:   William Breathitt Gray <william.gray@linaro.org>
To:     broonie@kernel.org
Cc:     linus.walleij@linaro.org, brgl@bgdev.pl,
        linux-kernel@vger.kernel.org, linux-gpio@vger.kernel.org
Subject: Re: [PATCH] regmap-irq: Drop map from handle_mask_sync() parameters
Message-ID: <ZAsfNel4835E+i6O@fedora>
References: <20230309232009.2938-1-william.gray@linaro.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
        protocol="application/pgp-signature"; boundary="2fUeKbfcSIUebyxb"
Content-Disposition: inline
In-Reply-To: <20230309232009.2938-1-william.gray@linaro.org>
Precedence: bulk


--2fUeKbfcSIUebyxb
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Thu, Mar 09, 2023 at 06:20:09PM -0500, William Breathitt Gray wrote:
> Remove the map parameter from the struct regmap_irq_chip callback
> handle_mask_sync() because it can be passed via the irq_drv_data
> parameter instead. The gpio-104-dio-48e driver is the only consumer of
> this callback and is thus updated accordingly.
>=20
> Signed-off-by: William Breathitt Gray <william.gray@linaro.org>

[...]

> diff --git a/drivers/gpio/gpio-104-dio-48e.c b/drivers/gpio/gpio-104-dio-=
48e.c
> index a3846faf3..1de551677 100644
> --- a/drivers/gpio/gpio-104-dio-48e.c
> +++ b/drivers/gpio/gpio-104-dio-48e.c
> @@ -99,14 +99,25 @@ static const struct regmap_irq dio48e_regmap_irqs[] =
=3D {
>  	DIO48E_REGMAP_IRQ(0), DIO48E_REGMAP_IRQ(1),
>  };
> =20
> -static int dio48e_handle_mask_sync(struct regmap *const map, const int i=
ndex,
> +/**
> + * struct dio48e_gpio - GPIO device private data structure
> + * @map:	Regmap for the device
> + * @irq_mask:	Current IRQ mask state on the device
> + */
> +struct dio48e_gpio {
> +	struct regmap *map;
> +	unsigned int irq_mask;
> +};
> +
> +static int dio48e_handle_mask_sync(const int index,
>  				   const unsigned int mask_buf_def,
>  				   const unsigned int mask_buf,
>  				   void *const irq_drv_data)
>  {
> -	unsigned int *const irq_mask =3D irq_drv_data;
> -	const unsigned int prev_mask =3D *irq_mask;
> +	struct dio48e_gpio *const dio48egpio =3D irq_drv_data;
> +	const unsigned int prev_mask =3D dio48egpio->irq_mask;
>  	const unsigned int all_masked =3D GENMASK(1, 0);
> +	struct regmap *const map =3D dio48egpio->map;
>  	int err;
>  	unsigned int val;
> =20
> @@ -115,7 +126,7 @@ static int dio48e_handle_mask_sync(struct regmap *con=
st map, const int index,
>  		return 0;
> =20
>  	/* remember the current mask for the next mask sync */
> -	*irq_mask =3D mask_buf;
> +	dio48egpio->irq_mask =3D mask_buf;
> =20
>  	/* if all previously masked, enable interrupts when unmasking */
>  	if (prev_mask =3D=3D all_masked) {

Mark,

These two hunks conflict with a minor gpio-104-dio-48e change in the
gpio/for-next branch [0]. I can rebase this patch on top of that change,
or would you prefer that this goes through the gpio tree?

I'll also split out the gpio-104-dio-48e changes to a precursor patch to
keep the focus here on the regmap-irq changes.

William Breathitt Gray

[0] Commit b961b2aa2f64 ("gpio: 104-dio-48e: Utilize mask_buf_def in handle=
_mask_sync() callback")

--2fUeKbfcSIUebyxb
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iHUEARYKAB0WIQSNN83d4NIlKPjon7a1SFbKvhIjKwUCZAsfNQAKCRC1SFbKvhIj
K3mWAQC6H/iV7npLxE9mPKpFhWGyskMYJjEodN3tR6eDth2EYgEAi/YP3ZqUeKLQ
22duU3HpZYULXOEAPY6BYOqr0pBIlgo=
=yaME
-----END PGP SIGNATURE-----

--2fUeKbfcSIUebyxb--