| Message ID | 62ae6810d41e0429ebaadfac8a95409f4bc72456.1688160163.git.christophe.jaillet@wanadoo.fr |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2] i2c: busses: i2c-nomadik: Remove a useless call in the remove function | expand |
On Fri, Jun 30, 2023 at 11:23 PM Christophe JAILLET <christophe.jaillet@wanadoo.fr> wrote: > Since commit a410963ba4c0 ("Merge branch 'i2c-embedded/for-next' of > git://git.pengutronix.de/git/wsa/linux"), there is no more > request_mem_region() call in this driver. > > So remove the release_mem_region() call from the remove function which is > likely a left over. > > There is no details in the above commit log, but at its end we can read: > Conflicts: > drivers/i2c/busses/i2c-nomadik.c > > This may explain why this call has been left here. > > Fixes: a410963ba4c0 ("Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > --- > v2: synch with latest -next Acked-by: Linus Walleij <linus.walleij@linaro.org> Yours, Linus Walleij
Hi Christophe, On Fri, Jun 30, 2023 at 11:23:28PM +0200, Christophe JAILLET wrote: > Since commit a410963ba4c0 ("Merge branch 'i2c-embedded/for-next' of > git://git.pengutronix.de/git/wsa/linux"), there is no more > request_mem_region() call in this driver. > > So remove the release_mem_region() call from the remove function which is > likely a left over. > > There is no details in the above commit log, but at its end we can read: > Conflicts: > drivers/i2c/busses/i2c-nomadik.c > > This may explain why this call has been left here. > > Fixes: a410963ba4c0 ("Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Reviewed-by: Andi Shyti <andi.shyti@kernel.org> Andi
On Fri, Jun 30, 2023 at 11:23:28PM +0200, Christophe JAILLET wrote: > Since commit a410963ba4c0 ("Merge branch 'i2c-embedded/for-next' of > git://git.pengutronix.de/git/wsa/linux"), there is no more > request_mem_region() call in this driver. > > So remove the release_mem_region() call from the remove function which is > likely a left over. > > There is no details in the above commit log, but at its end we can read: > Conflicts: > drivers/i2c/busses/i2c-nomadik.c > > This may explain why this call has been left here. > > Fixes: a410963ba4c0 ("Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux The reason why you're so confused about this Merge commit is because it's completely unrelated to the bug. :P It should be: Fixes: 235602146ec9 (i2c-nomadik: turn the platform driver to an amba driver) When you look at that commit, you'll see that your patch is correct. regards, dan carpenter
Hi, On Mon, Jul 03, 2023 at 03:54:42PM +0300, Dan Carpenter wrote: > On Fri, Jun 30, 2023 at 11:23:28PM +0200, Christophe JAILLET wrote: > > Since commit a410963ba4c0 ("Merge branch 'i2c-embedded/for-next' of > > git://git.pengutronix.de/git/wsa/linux"), there is no more > > request_mem_region() call in this driver. > > > > So remove the release_mem_region() call from the remove function which is > > likely a left over. > > > > There is no details in the above commit log, but at its end we can read: > > Conflicts: > > drivers/i2c/busses/i2c-nomadik.c > > > > This may explain why this call has been left here. > > > > Fixes: a410963ba4c0 ("Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux > > The reason why you're so confused about this Merge commit is because > it's completely unrelated to the bug. :P It should be: > > Fixes: 235602146ec9 (i2c-nomadik: turn the platform driver to an amba driver) > > When you look at that commit, you'll see that your patch is correct. Yes, indeed I noticed the same but did not investigate further. Please, also add: Cc: <stable@vger.kernel.org> # v3.6+ Andi
diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c index 1e5fd23ef45c..212f412f1c74 100644 --- a/drivers/i2c/busses/i2c-nomadik.c +++ b/drivers/i2c/busses/i2c-nomadik.c @@ -1038,7 +1038,6 @@ static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id) static void nmk_i2c_remove(struct amba_device *adev) { - struct resource *res = &adev->res; struct nmk_i2c_dev *dev = amba_get_drvdata(adev); i2c_del_adapter(&dev->adap); @@ -1047,7 +1046,6 @@ static void nmk_i2c_remove(struct amba_device *adev) clear_all_interrupts(dev); /* disable the controller */ i2c_clr_bit(dev->virtbase + I2C_CR, I2C_CR_PE); - release_mem_region(res->start, resource_size(res)); } static struct i2c_vendor_data vendor_stn8815 = {
Since commit a410963ba4c0 ("Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux"), there is no more request_mem_region() call in this driver. So remove the release_mem_region() call from the remove function which is likely a left over. There is no details in the above commit log, but at its end we can read: Conflicts: drivers/i2c/busses/i2c-nomadik.c This may explain why this call has been left here. Fixes: a410963ba4c0 ("Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- v2: synch with latest -next v1: https://lore.kernel.org/all/4f4c2c5c20b61c4bb28cb3e9ab4640534dd2adec.1629530169.git.christophe.jaillet@wanadoo.fr/ /!\ /!\ /!\ /!\ /!\ /!\ This patch is completely speculative and without details about commit a410963ba4c0 it's hard to be sure of the intent. /!\ /!\ /!\ /!\ /!\ /!\ All I can say is that it looks logical to me and that it compiles! --- drivers/i2c/busses/i2c-nomadik.c | 2 -- 1 file changed, 2 deletions(-)