Skip to content

Commit

Permalink
ASoC: Intel: catpt: remove duplicating driver data retrieval
Browse files Browse the repository at this point in the history
device_get_match_data() in ACPI case calls similar to acpi_match_device() API.
Hence there is no need to duplicate the call. Just check what the former
returns.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
  • Loading branch information
andy-shev authored and intel-lab-lkp committed Jul 2, 2022
1 parent 2a8cf5c commit a83f741
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions sound/soc/intel/catpt/device.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,14 @@
// helping backtrack its historical background
//

#include <linux/acpi.h>
#include <linux/dma-mapping.h>
#include <linux/interrupt.h>
#include <linux/mod_devicetable.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/platform_device.h>
#include <linux/pm_runtime.h>
#include <linux/property.h>
#include <sound/intel-dsp-config.h>
#include <sound/soc.h>
#include <sound/soc-acpi.h>
Expand Down Expand Up @@ -244,8 +245,8 @@ static int catpt_acpi_probe(struct platform_device *pdev)
struct resource *res;
int ret;

id = acpi_match_device(dev->driver->acpi_match_table, dev);
if (!id)
spec = device_get_match_data(dev);
if (!spec)
return -ENODEV;

ret = snd_intel_acpi_dsp_driver_probe(dev, id->id);
Expand All @@ -254,10 +255,6 @@ static int catpt_acpi_probe(struct platform_device *pdev)
return -ENODEV;
}

spec = device_get_match_data(dev);
if (!spec)
return -ENODEV;

cdev = devm_kzalloc(dev, sizeof(*cdev), GFP_KERNEL);
if (!cdev)
return -ENOMEM;
Expand Down

0 comments on commit a83f741

Please sign in to comment.