| Message ID | 20210812224443.170144-3-pierre-louis.bossart@linux.intel.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ASoC: Intel: boards: use software node API | expand |
On Thu, Aug 12, 2021 at 05:44:37PM -0500, Pierre-Louis Bossart wrote: > acpi_dev_get_first_match_dev() searches for an acpi_handle > instantiated by the ACPI table scanning done early during boot. > > Two of three machine drivers using this search don't deal with errors > and the one which does (bytcr_rt5651) returns -ENODEV, which doesn't > make sense here: an alternate driver will not be probed. > > Add consistent error handling and report -ENXIO Missed period. Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Suggested-by: Hans de Goede <hdegoede@redhat.com> > Reviewed-by: Hans de Goede <hdegoede@redhat.com> > Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> > --- > sound/soc/intel/boards/bytcht_es8316.c | 3 +++ > sound/soc/intel/boards/bytcr_rt5640.c | 3 +++ > sound/soc/intel/boards/bytcr_rt5651.c | 2 +- > 3 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c > index fcf7c9c04069..7c078a9f6deb 100644 > --- a/sound/soc/intel/boards/bytcht_es8316.c > +++ b/sound/soc/intel/boards/bytcht_es8316.c > @@ -492,6 +492,9 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev) > "i2c-%s", acpi_dev_name(adev)); > put_device(&adev->dev); > byt_cht_es8316_dais[dai_index].codecs->name = codec_name; > + } else { > + dev_err(&pdev->dev, "Error cannot find '%s' dev\n", mach->id); > + return -ENXIO; > } > > /* override plaform name, if required */ > diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c > index 808bfb7fd81e..60ed954d7277 100644 > --- a/sound/soc/intel/boards/bytcr_rt5640.c > +++ b/sound/soc/intel/boards/bytcr_rt5640.c > @@ -1396,6 +1396,9 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) > "i2c-%s", acpi_dev_name(adev)); > put_device(&adev->dev); > byt_rt5640_dais[dai_index].codecs->name = byt_rt5640_codec_name; > + } else { > + dev_err(&pdev->dev, "Error cannot find '%s' dev\n", mach->id); > + return -ENXIO; > } > > /* > diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c > index 7033c07f8fd6..b4307d1d5527 100644 > --- a/sound/soc/intel/boards/bytcr_rt5651.c > +++ b/sound/soc/intel/boards/bytcr_rt5651.c > @@ -921,7 +921,7 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) > byt_rt5651_dais[dai_index].codecs->name = byt_rt5651_codec_name; > } else { > dev_err(&pdev->dev, "Error cannot find '%s' dev\n", mach->id); > - return -ENODEV; > + return -ENXIO; > } > > codec_dev = bus_find_device_by_name(&i2c_bus_type, NULL, > -- > 2.25.1 >
diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c index fcf7c9c04069..7c078a9f6deb 100644 --- a/sound/soc/intel/boards/bytcht_es8316.c +++ b/sound/soc/intel/boards/bytcht_es8316.c @@ -492,6 +492,9 @@ static int snd_byt_cht_es8316_mc_probe(struct platform_device *pdev) "i2c-%s", acpi_dev_name(adev)); put_device(&adev->dev); byt_cht_es8316_dais[dai_index].codecs->name = codec_name; + } else { + dev_err(&pdev->dev, "Error cannot find '%s' dev\n", mach->id); + return -ENXIO; } /* override plaform name, if required */ diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c index 808bfb7fd81e..60ed954d7277 100644 --- a/sound/soc/intel/boards/bytcr_rt5640.c +++ b/sound/soc/intel/boards/bytcr_rt5640.c @@ -1396,6 +1396,9 @@ static int snd_byt_rt5640_mc_probe(struct platform_device *pdev) "i2c-%s", acpi_dev_name(adev)); put_device(&adev->dev); byt_rt5640_dais[dai_index].codecs->name = byt_rt5640_codec_name; + } else { + dev_err(&pdev->dev, "Error cannot find '%s' dev\n", mach->id); + return -ENXIO; } /* diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c index 7033c07f8fd6..b4307d1d5527 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c @@ -921,7 +921,7 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) byt_rt5651_dais[dai_index].codecs->name = byt_rt5651_codec_name; } else { dev_err(&pdev->dev, "Error cannot find '%s' dev\n", mach->id); - return -ENODEV; + return -ENXIO; } codec_dev = bus_find_device_by_name(&i2c_bus_type, NULL,