tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Geert Uytterhoeven and committed by
Greg Kroah-Hartman c9d032cb 300034f9

+13 -18
+13 -18
drivers/usb/phy/phy-generic.c
··· 227 227 return -ENOMEM; 228 228 229 229 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"); 235 233 236 234 if (clk_rate) { 237 235 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"); 242 239 } 243 240 244 241 nop->vcc = devm_regulator_get_optional(dev, "vcc"); ··· 280 283 err = usb_phy_gen_create_phy(dev, nop); 281 284 if (err) 282 285 return err; 286 + 283 287 if (nop->gpiod_vbus) { 284 288 err = devm_request_threaded_irq(dev, 285 289 gpiod_to_irq(nop->gpiod_vbus), 286 290 NULL, nop_gpio_vbus_thread, 287 291 VBUS_IRQ_FLAGS, "vbus_detect", 288 292 nop); 289 - if (err) { 290 - dev_err(dev, "can't request irq %i, err: %d\n", 291 - gpiod_to_irq(nop->gpiod_vbus), err); 292 - return err; 293 - } 293 + if (err) 294 + return dev_err_probe(dev, err, "can't request irq %i\n", 295 + gpiod_to_irq(nop->gpiod_vbus)); 296 + 294 297 nop->phy.otg->state = gpiod_get_value(nop->gpiod_vbus) ? 295 298 OTG_STATE_B_PERIPHERAL : OTG_STATE_B_IDLE; 296 299 } ··· 299 302 nop->phy.shutdown = usb_gen_phy_shutdown; 300 303 301 304 err = usb_add_phy_dev(&nop->phy); 302 - if (err) { 303 - dev_err(dev, "can't register transceiver, err: %d\n", err); 304 - return err; 305 - } 305 + if (err) 306 + return dev_err_probe(dev, err, "can't register transceiver\n"); 306 307 307 308 platform_set_drvdata(pdev, nop); 308 309