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.

ASoC: tegra: Use dev_err_probe() in tegra_asoc_machine probe

Log errors in the Tegra ASoC machine driver probe path using
dev_err_probe().

Signed-off-by: Sheetal <sheetal@nvidia.com>
Link: https://patch.msgid.link/20260325101437.3059693-14-sheetal@nvidia.com
Signed-off-by: Mark Brown <broonie@kernel.org>

authored by

Sheetal and committed by
Mark Brown fa11e1cb 856ffd8f

+35 -35
+35 -35
sound/soc/tegra/tegra_asoc_machine.c
··· 432 432 433 433 pdev = platform_device_register_simple(name, -1, NULL, 0); 434 434 if (IS_ERR(pdev)) 435 - return PTR_ERR(pdev); 435 + return dev_err_probe(dev, PTR_ERR(pdev), 436 + "failed to register codec %s\n", name); 436 437 437 438 err = devm_add_action_or_reset(dev, tegra_machine_unregister_codec, 438 439 pdev); ··· 469 468 gpiod = devm_gpiod_get_optional(dev, "nvidia,hp-mute", GPIOD_OUT_HIGH); 470 469 machine->gpiod_hp_mute = gpiod; 471 470 if (IS_ERR(gpiod)) 472 - return PTR_ERR(gpiod); 471 + return dev_err_probe(dev, PTR_ERR(gpiod), 472 + "failed to get hp-mute GPIO\n"); 473 473 474 474 gpiod = devm_gpiod_get_optional(dev, "nvidia,hp-det", GPIOD_IN); 475 475 machine->gpiod_hp_det = gpiod; 476 476 if (IS_ERR(gpiod)) 477 - return PTR_ERR(gpiod); 477 + return dev_err_probe(dev, PTR_ERR(gpiod), 478 + "failed to get hp-det GPIO\n"); 478 479 479 480 gpiod = devm_gpiod_get_optional(dev, "nvidia,mic-det", GPIOD_IN); 480 481 machine->gpiod_mic_det = gpiod; 481 482 if (IS_ERR(gpiod)) 482 - return PTR_ERR(gpiod); 483 + return dev_err_probe(dev, PTR_ERR(gpiod), 484 + "failed to get mic-det GPIO\n"); 483 485 484 486 gpiod = devm_gpiod_get_optional(dev, "nvidia,spkr-en", GPIOD_OUT_LOW); 485 487 machine->gpiod_spkr_en = gpiod; 486 488 if (IS_ERR(gpiod)) 487 - return PTR_ERR(gpiod); 489 + return dev_err_probe(dev, PTR_ERR(gpiod), 490 + "failed to get spkr-en GPIO\n"); 488 491 489 492 gpiod = devm_gpiod_get_optional(dev, "nvidia,int-mic-en", GPIOD_OUT_LOW); 490 493 machine->gpiod_int_mic_en = gpiod; 491 494 if (IS_ERR(gpiod)) 492 - return PTR_ERR(gpiod); 495 + return dev_err_probe(dev, PTR_ERR(gpiod), 496 + "failed to get int-mic-en GPIO\n"); 493 497 494 498 gpiod = devm_gpiod_get_optional(dev, "nvidia,ext-mic-en", GPIOD_OUT_LOW); 495 499 machine->gpiod_ext_mic_en = gpiod; 496 500 if (IS_ERR(gpiod)) 497 - return PTR_ERR(gpiod); 501 + return dev_err_probe(dev, PTR_ERR(gpiod), 502 + "failed to get ext-mic-en GPIO\n"); 498 503 499 504 err = snd_soc_of_parse_card_name(card, "nvidia,model"); 500 505 if (err) ··· 556 549 card->driver_name = "tegra"; 557 550 558 551 machine->clk_pll_a = devm_clk_get(dev, "pll_a"); 559 - if (IS_ERR(machine->clk_pll_a)) { 560 - dev_err(dev, "Can't retrieve clk pll_a\n"); 561 - return PTR_ERR(machine->clk_pll_a); 562 - } 552 + if (IS_ERR(machine->clk_pll_a)) 553 + return dev_err_probe(dev, PTR_ERR(machine->clk_pll_a), 554 + "can't retrieve clk pll_a\n"); 563 555 564 556 machine->clk_pll_a_out0 = devm_clk_get(dev, "pll_a_out0"); 565 - if (IS_ERR(machine->clk_pll_a_out0)) { 566 - dev_err(dev, "Can't retrieve clk pll_a_out0\n"); 567 - return PTR_ERR(machine->clk_pll_a_out0); 568 - } 557 + if (IS_ERR(machine->clk_pll_a_out0)) 558 + return dev_err_probe(dev, PTR_ERR(machine->clk_pll_a_out0), 559 + "can't retrieve clk pll_a_out0\n"); 569 560 570 561 machine->clk_cdev1 = devm_clk_get(dev, "mclk"); 571 - if (IS_ERR(machine->clk_cdev1)) { 572 - dev_err(dev, "Can't retrieve clk cdev1\n"); 573 - return PTR_ERR(machine->clk_cdev1); 574 - } 562 + if (IS_ERR(machine->clk_cdev1)) 563 + return dev_err_probe(dev, PTR_ERR(machine->clk_cdev1), 564 + "can't retrieve clk cdev1\n"); 575 565 576 566 /* 577 567 * If clock parents are not set in DT, configure here to use clk_out_1 ··· 582 578 dev_warn(dev, "Please update DT to use assigned-clock-parents\n"); 583 579 584 580 clk_extern1 = devm_clk_get(dev, "extern1"); 585 - if (IS_ERR(clk_extern1)) { 586 - dev_err(dev, "Can't retrieve clk extern1\n"); 587 - return PTR_ERR(clk_extern1); 588 - } 581 + if (IS_ERR(clk_extern1)) 582 + return dev_err_probe(dev, PTR_ERR(clk_extern1), 583 + "can't retrieve clk extern1\n"); 589 584 590 585 err = clk_set_parent(clk_extern1, machine->clk_pll_a_out0); 591 - if (err < 0) { 592 - dev_err(dev, "Set parent failed for clk extern1\n"); 593 - return err; 594 - } 586 + if (err < 0) 587 + return dev_err_probe(dev, err, 588 + "set parent failed for clk extern1\n"); 595 589 596 590 clk_out_1 = devm_clk_get(dev, "pmc_clk_out_1"); 597 - if (IS_ERR(clk_out_1)) { 598 - dev_err(dev, "Can't retrieve pmc_clk_out_1\n"); 599 - return PTR_ERR(clk_out_1); 600 - } 591 + if (IS_ERR(clk_out_1)) 592 + return dev_err_probe(dev, PTR_ERR(clk_out_1), 593 + "can't retrieve pmc_clk_out_1\n"); 601 594 602 595 err = clk_set_parent(clk_out_1, clk_extern1); 603 - if (err < 0) { 604 - dev_err(dev, "Set parent failed for pmc_clk_out_1\n"); 605 - return err; 606 - } 596 + if (err < 0) 597 + return dev_err_probe(dev, err, 598 + "set parent failed for pmc_clk_out_1\n"); 607 599 608 600 machine->clk_cdev1 = clk_out_1; 609 601 }