Skip to content

Commit c9d032c

Browse files
geertugregkh
authored andcommitted
usb: phy: generic: Convert to dev_err_probe()
Convert the remaining error handling in the probe path to use the dev_err_probe() helper, to make sure error messages and codes are not missed, and recorded properly. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Link: https://patch.msgid.link/68739eb048a394fe9198080e4e57503bb2fb9b64.1769004444.git.geert+renesas@glider.be Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 300034f commit c9d032c

1 file changed

Lines changed: 13 additions & 18 deletions

File tree

drivers/usb/phy/phy-generic.c

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -227,18 +227,15 @@ int usb_phy_gen_create_phy(struct device *dev, struct usb_phy_generic *nop)
227227
return -ENOMEM;
228228

229229
nop->clk = devm_clk_get_optional(dev, "main_clk");
230-
if (IS_ERR(nop->clk)) {
231-
dev_dbg(dev, "Can't get phy clock: %ld\n",
232-
PTR_ERR(nop->clk));
233-
return PTR_ERR(nop->clk);
234-
}
230+
if (IS_ERR(nop->clk))
231+
return dev_err_probe(dev, PTR_ERR(nop->clk),
232+
"Can't get phy clock\n");
235233

236234
if (clk_rate) {
237235
err = clk_set_rate(nop->clk, clk_rate);
238-
if (err) {
239-
dev_err(dev, "Error setting clock rate\n");
240-
return err;
241-
}
236+
if (err)
237+
return dev_err_probe(dev, err,
238+
"Error setting clock rate\n");
242239
}
243240

244241
nop->vcc = devm_regulator_get_optional(dev, "vcc");
@@ -283,17 +280,17 @@ static int usb_phy_generic_probe(struct platform_device *pdev)
283280
err = usb_phy_gen_create_phy(dev, nop);
284281
if (err)
285282
return err;
283+
286284
if (nop->gpiod_vbus) {
287285
err = devm_request_threaded_irq(dev,
288286
gpiod_to_irq(nop->gpiod_vbus),
289287
NULL, nop_gpio_vbus_thread,
290288
VBUS_IRQ_FLAGS, "vbus_detect",
291289
nop);
292-
if (err) {
293-
dev_err(dev, "can't request irq %i, err: %d\n",
294-
gpiod_to_irq(nop->gpiod_vbus), err);
295-
return err;
296-
}
290+
if (err)
291+
return dev_err_probe(dev, err, "can't request irq %i\n",
292+
gpiod_to_irq(nop->gpiod_vbus));
293+
297294
nop->phy.otg->state = gpiod_get_value(nop->gpiod_vbus) ?
298295
OTG_STATE_B_PERIPHERAL : OTG_STATE_B_IDLE;
299296
}
@@ -302,10 +299,8 @@ static int usb_phy_generic_probe(struct platform_device *pdev)
302299
nop->phy.shutdown = usb_gen_phy_shutdown;
303300

304301
err = usb_add_phy_dev(&nop->phy);
305-
if (err) {
306-
dev_err(dev, "can't register transceiver, err: %d\n", err);
307-
return err;
308-
}
302+
if (err)
303+
return dev_err_probe(dev, err, "can't register transceiver\n");
309304

310305
platform_set_drvdata(pdev, nop);
311306

0 commit comments

Comments
 (0)