| Message ID | 367e77d8-3a65-2c12-5e79-75a626b65f41@users.sourceforge.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, 15 Jan 2018, SF Markus Elfring wrote: > From: Markus Elfring <elfring@users.sourceforge.net> > Date: Mon, 15 Jan 2018 14:00:45 +0100 > > * Return an error code without storing it in an intermediate variable. > > * Delete the label "err_clk_alloc" and local variable "ret" > which became unnecessary with this refactoring. > > Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> > --- > drivers/mfd/omap-usb-tll.c | 12 +++--------- > 1 file changed, 3 insertions(+), 9 deletions(-) Applied, thanks.
On Mon, 22 Jan 2018, Lee Jones wrote: > On Mon, 15 Jan 2018, SF Markus Elfring wrote: > > > From: Markus Elfring <elfring@users.sourceforge.net> > > Date: Mon, 15 Jan 2018 14:00:45 +0100 > > > > * Return an error code without storing it in an intermediate variable. > > > > * Delete the label "err_clk_alloc" and local variable "ret" > > which became unnecessary with this refactoring. > > > > Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> > > --- > > drivers/mfd/omap-usb-tll.c | 12 +++--------- > > 1 file changed, 3 insertions(+), 9 deletions(-) > > Applied, thanks. This patch does not apply. Please rebase and resend.
>> Applied, thanks. > > This patch does not apply. > > Please rebase and resend. Did you notice that this update suggestion could eventually be superseded by the software change “[PATCH v2] mfd: omap-usb-tll: Allocate driver data at once”? https://lkml.org/lkml/2018/1/23/277 https://patchwork.kernel.org/patch/10165339/ https://lkml.kernel.org/r/<20180115202505.GA2628@lenoch> Regards, Markus -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, 23 Jan 2018, SF Markus Elfring wrote: > >> Applied, thanks. > > > > This patch does not apply. > > > > Please rebase and resend. > > Did you notice that this update suggestion could eventually be superseded > by the software change “[PATCH v2] mfd: omap-usb-tll: Allocate driver data at once”? How would I? It looks like a completely different patch. In future, please either reply to the original patch with the follow-up patch OR reply to the original patch to say it's been superseded, and provide an indication of which patch superseded it. > https://lkml.org/lkml/2018/1/23/277 > https://patchwork.kernel.org/patch/10165339/ > https://lkml.kernel.org/r/<20180115202505.GA2628@lenoch>
Lee, On Tue, Jan 23, 2018 at 03:04:08PM +0000, Lee Jones wrote: > On Tue, 23 Jan 2018, SF Markus Elfring wrote: > > > >> Applied, thanks. > > > > > > This patch does not apply. > > > > > > Please rebase and resend. > > > > Did you notice that this update suggestion could eventually be superseded > > by the software change “[PATCH v2] mfd: omap-usb-tll: Allocate driver data at once”? > > How would I? It looks like a completely different patch. > > In future, please either reply to the original patch with the > follow-up patch OR reply to the original patch to say it's been > superseded, and provide an indication of which patch superseded it. this is my fault. I should point out that v2 superseded also other patches in the serie (see previous discussion, how that happened). I'm sorry for this. > > https://lkml.org/lkml/2018/1/23/277 > > https://patchwork.kernel.org/patch/10165339/ > > https://lkml.kernel.org/r/<20180115202505.GA2628@lenoch> > > -- > Lee Jones > Linaro Services Technical Lead > Linaro.org │ Open source software for ARM SoCs > Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, 23 Jan 2018, Ladislav Michl wrote: > Lee, > > On Tue, Jan 23, 2018 at 03:04:08PM +0000, Lee Jones wrote: > > On Tue, 23 Jan 2018, SF Markus Elfring wrote: > > > > > >> Applied, thanks. > > > > > > > > This patch does not apply. > > > > > > > > Please rebase and resend. > > > > > > Did you notice that this update suggestion could eventually be superseded > > > by the software change “[PATCH v2] mfd: omap-usb-tll: Allocate driver data at once”? > > > > How would I? It looks like a completely different patch. > > > > In future, please either reply to the original patch with the > > follow-up patch OR reply to the original patch to say it's been > > superseded, and provide an indication of which patch superseded it. > > this is my fault. I should point out that v2 superseded also other > patches in the serie (see previous discussion, how that happened). > > I'm sorry for this. Not a problem.
diff --git a/drivers/mfd/omap-usb-tll.c b/drivers/mfd/omap-usb-tll.c index c8b4ad40910a..6c0be886fd87 100644 --- a/drivers/mfd/omap-usb-tll.c +++ b/drivers/mfd/omap-usb-tll.c @@ -216,7 +216,6 @@ static int usbtll_omap_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; struct resource *res; struct usbtll_omap *tll; - int ret = 0; int i, ver; dev_dbg(dev, "starting TI HSUSB TLL Controller\n"); @@ -254,8 +253,9 @@ static int usbtll_omap_probe(struct platform_device *pdev) tll->ch_clk = devm_kzalloc(dev, sizeof(struct clk *) * tll->nch, GFP_KERNEL); if (!tll->ch_clk) { - ret = -ENOMEM; - goto err_clk_alloc; + pm_runtime_put_sync(dev); + pm_runtime_disable(dev); + return -ENOMEM; } for (i = 0; i < tll->nch; i++) { @@ -278,12 +278,6 @@ static int usbtll_omap_probe(struct platform_device *pdev) spin_unlock(&tll_lock); return 0; - -err_clk_alloc: - pm_runtime_put_sync(dev); - pm_runtime_disable(dev); - - return ret; } /**