Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Tue, 11 Feb 2020 23:21:29 +0100
From:   Andreas Kemnade <andreas@kemnade.info>
To:     Lee Jones <lee.jones@linaro.org>
Cc:     linux-kernel@vger.kernel.org
Subject: Re: [PATCH] mfd: rn5t618: cleanup i2c_device_id
Message-ID: <20200211232129.0594d397@kemnade.info>
In-Reply-To: <20200130152428.GD3548@dell>
References: <20191211215731.19350-1-andreas@kemnade.info>
        <20200128194555.324cff21@kemnade.info>
        <20200130152428.GD3548@dell>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 boundary="Sig_/nxiL9CKKHkacqD+I6uRLg.G"; protocol="application/pgp-signature"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

--Sig_/nxiL9CKKHkacqD+I6uRLg.G
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

On Thu, 30 Jan 2020 15:24:28 +0000
Lee Jones <lee.jones@linaro.org> wrote:

> On Tue, 28 Jan 2020, Andreas Kemnade wrote:
>=20
> > Hi,
> >=20
> > just re-checking the patch again. Seems that I have added it on top of =
my RTC
> > series. It breaks because of...
> >=20
> > On Wed, 11 Dec 2019 22:57:31 +0100
> > Andreas Kemnade <andreas@kemnade.info> wrote:
> >  =20
> > > That list was just empty, so it can be removed if .probe_new
> > > instead of .probe is used
> > >=20
> > > Suggested-by: Lee Jones <lee.jones@linaro.org>
> > > Signed-off-by: Andreas Kemnade <andreas@kemnade.info>
> > > ---
> > >  drivers/mfd/rn5t618.c | 11 ++---------
> > >  1 file changed, 2 insertions(+), 9 deletions(-)
> > >=20
> > > diff --git a/drivers/mfd/rn5t618.c b/drivers/mfd/rn5t618.c
> > > index 18d56a732b20..70d52b46ee8a 100644
> > > --- a/drivers/mfd/rn5t618.c
> > > +++ b/drivers/mfd/rn5t618.c
> > > @@ -150,8 +150,7 @@ static const struct of_device_id rn5t618_of_match=
[] =3D {
> > >  };
> > >  MODULE_DEVICE_TABLE(of, rn5t618_of_match);
> > > =20
> > > -static int rn5t618_i2c_probe(struct i2c_client *i2c,
> > > -			     const struct i2c_device_id *id)
> > > +static int rn5t618_i2c_probe(struct i2c_client *i2c)
> > >  {
> > >  	const struct of_device_id *of_id;
> > >  	struct rn5t618 *priv;
> > > @@ -251,11 +250,6 @@ static int __maybe_unused rn5t618_i2c_resume(str=
uct device *dev)
> > >  	return 0;
> > >  }
> > >   =20
> > I added the pm stuff above ...
> >=20
> >  =20
> > > -static const struct i2c_device_id rn5t618_i2c_id[] =3D {
> > > -	{ }
> > > -};
> > > -MODULE_DEVICE_TABLE(i2c, rn5t618_i2c_id);
> > > - =20
> >=20
> > and below it in my RTC series.
> >  =20
> > >  static SIMPLE_DEV_PM_OPS(rn5t618_i2c_dev_pm_ops,
> > >  			rn5t618_i2c_suspend,
> > >  			rn5t618_i2c_resume); =20
> >=20
> > Do you want to have it rebased so it can be applied first?
> > Sorry for the confusion here. =20
>=20
> You may as well wait until -rc1 is out and rebase on top of that.
>=20
hmm, then the RTC/IRQ series does not apply on top of it:
https://lore.kernel.org/lkml/20191220122416.31881-1-andreas@kemnade.info/

and needs to be rebased. I have no idea if that is more favorable for you.
The RTC/IRQ series happily applies on top of v5.6-rc1, but not on top of
this patch.

Yes, I should have documented that apply-conflict, but was
not aware of it while submitting this patch.

Regards,
Andreas

--Sig_/nxiL9CKKHkacqD+I6uRLg.G
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQIzBAEBCAAdFiEEPIWxmAFyOaBcwCpFl4jFM1s/ye8FAl5DKOkACgkQl4jFM1s/
ye8T9g/+OCOYZG7WNDbF0krSdNmZ/vyPBoqmgkHFoWZ4iNnnSiLVW3XABkPWjbvG
cglCqYeBIrxYR6c/Am5GpAUkqRZiWizK77QHtrlb9dJIDb/GWoQ/IGYDJjr/MT3U
OUmoW9VEo03Ph/Yero3eTn7tkYusKQeBb8fc877VMVwTx/MsTC6/4iwqog0effZh
ot3g1J1RSzlshtqh26RNJADnPTEyqlEXsIer+aOn0SL/bAbukYvT2MZ8Ph4k4cEq
TRnJvQgJ3tYODhXroJhUiXUDjio2st7Nuf32BVZ2EXN9SPBS9ywpKpxpOBy+FrEC
TVGBg5LE2+HIL9kdZSB8GkAAlVKB9k/UAkzo7k6CM4UbYFcPD/oDdlJ0l3YFKIPD
zfZnV6LojCPopDyuoTZKfiqgX0NRF/RWTM2jyH/dB2rI5XikkHVyVu30QrgTlIj3
CkGLcL8v1z+rwPBnVwtWXynVaNi3EDSIhNHyMGKNQ5BMTXLcm0B6/iaVe3GcHj98
gQ0CBdVQH3f+0GsSo0N2W7YgiyHR0Bg/V2ZaT25rA9xb9Pn/13Tlow8dKSZ4AZhW
5/T7jmHXoOE4H3yKqmhuTMp1qH/5QXH5KU/xueoqXcerVs0NR6VCYPHhR0Zt1scP
X/Ygr6xBRmwxofCCoju2mOVI0gGk6txGiZfLoadhy5rAn4QOkkQ=
=4uhQ
-----END PGP SIGNATURE-----

--Sig_/nxiL9CKKHkacqD+I6uRLg.G--