Message ID | 20190322071611.16407-2-alexandre.belloni@bootlin.com |
---|---|
State | Accepted |
Headers | show |
Series | [1/4] rtc: wm831x: set range | expand |
On Fri, Mar 22, 2019 at 08:16:09AM +0100, Alexandre Belloni wrote: > There is no specific handling in the error path of wm831x_rtc_probe, remove > the unnecessary goto and label. > > Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> > --- Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com> Thanks, Charles
diff --git a/drivers/rtc/rtc-wm831x.c b/drivers/rtc/rtc-wm831x.c index deaffe0eaf2f..1b0c3b3f63e8 100644 --- a/drivers/rtc/rtc-wm831x.c +++ b/drivers/rtc/rtc-wm831x.c @@ -429,7 +429,7 @@ static int wm831x_rtc_probe(struct platform_device *pdev) ret = wm831x_reg_read(wm831x, WM831X_RTC_CONTROL); if (ret < 0) { dev_err(&pdev->dev, "Failed to read RTC control: %d\n", ret); - goto err; + return ret; } if (ret & WM831X_RTC_ALM_ENA) wm831x_rtc->alarm_enabled = 1; @@ -459,9 +459,6 @@ static int wm831x_rtc_probe(struct platform_device *pdev) wm831x_rtc_add_randomness(wm831x); return 0; - -err: - return ret; } static const struct dev_pm_ops wm831x_rtc_pm_ops = {
There is no specific handling in the error path of wm831x_rtc_probe, remove the unnecessary goto and label. Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> --- drivers/rtc/rtc-wm831x.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)