| device.c (4fb87241e5192caf9226fd4ca96ce2fd861503c1) | device.c (ec8a15d3a7c7d6e9acd2e0637d2020ac17fb7820) |
|---|---|
| 1// SPDX-License-Identifier: GPL-2.0-only 2// 3// Copyright(c) 2020 Intel Corporation. All rights reserved. 4// 5// Author: Cezary Rojewski <cezary.rojewski@intel.com> 6// 7// Special thanks to: 8// Marcin Barlik <marcin.barlik@intel.com> --- 5 unchanged lines hidden (view full) --- 14 15#include <linux/acpi.h> 16#include <linux/dma-mapping.h> 17#include <linux/interrupt.h> 18#include <linux/module.h> 19#include <linux/pci.h> 20#include <linux/platform_device.h> 21#include <linux/pm_runtime.h> | 1// SPDX-License-Identifier: GPL-2.0-only 2// 3// Copyright(c) 2020 Intel Corporation. All rights reserved. 4// 5// Author: Cezary Rojewski <cezary.rojewski@intel.com> 6// 7// Special thanks to: 8// Marcin Barlik <marcin.barlik@intel.com> --- 5 unchanged lines hidden (view full) --- 14 15#include <linux/acpi.h> 16#include <linux/dma-mapping.h> 17#include <linux/interrupt.h> 18#include <linux/module.h> 19#include <linux/pci.h> 20#include <linux/platform_device.h> 21#include <linux/pm_runtime.h> |
| 22#include <sound/intel-dsp-config.h> |
|
| 22#include <sound/soc.h> 23#include <sound/soc-acpi.h> 24#include <sound/soc-acpi-intel-match.h> 25#include "core.h" 26#include "registers.h" 27 28#define CREATE_TRACE_POINTS 29#include "trace.h" --- 204 unchanged lines hidden (view full) --- 234 catpt_iram_size(cdev)); 235} 236 237static int catpt_acpi_probe(struct platform_device *pdev) 238{ 239 const struct catpt_spec *spec; 240 struct catpt_dev *cdev; 241 struct device *dev = &pdev->dev; | 23#include <sound/soc.h> 24#include <sound/soc-acpi.h> 25#include <sound/soc-acpi-intel-match.h> 26#include "core.h" 27#include "registers.h" 28 29#define CREATE_TRACE_POINTS 30#include "trace.h" --- 204 unchanged lines hidden (view full) --- 235 catpt_iram_size(cdev)); 236} 237 238static int catpt_acpi_probe(struct platform_device *pdev) 239{ 240 const struct catpt_spec *spec; 241 struct catpt_dev *cdev; 242 struct device *dev = &pdev->dev; |
| 243 const struct acpi_device_id *id; |
|
| 242 struct resource *res; 243 int ret; 244 | 244 struct resource *res; 245 int ret; 246 |
| 247 id = acpi_match_device(dev->driver->acpi_match_table, dev); 248 if (!id) 249 return -ENODEV; 250 251 ret = snd_intel_acpi_dsp_driver_probe(dev, id->id); 252 if (ret != SND_INTEL_DSP_DRIVER_ANY && ret != SND_INTEL_DSP_DRIVER_SST) { 253 dev_dbg(dev, "CATPT ACPI driver not selected, aborting probe\n"); 254 return -ENODEV; 255 } 256 |
|
| 245 spec = device_get_match_data(dev); 246 if (!spec) 247 return -ENODEV; 248 249 cdev = devm_kzalloc(dev, sizeof(*cdev), GFP_KERNEL); 250 if (!cdev) 251 return -ENOMEM; 252 --- 103 unchanged lines hidden --- | 257 spec = device_get_match_data(dev); 258 if (!spec) 259 return -ENODEV; 260 261 cdev = devm_kzalloc(dev, sizeof(*cdev), GFP_KERNEL); 262 if (!cdev) 263 return -ENOMEM; 264 --- 103 unchanged lines hidden --- |