leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'topic/iio' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-st-dfsdm

Browse Source
This commit is contained in:
Mark Brown 2018-01-16 15:21:19 +00:00
commit d84b4c7c70
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/iio/adc/stm32-dfsdm-adc.c
View File

@ -1087,29 +1087,18 @@ static int stm32_dfsdm_adc_probe(struct platform_device *pdev)
struct device_node *np = dev->of_node; struct device_node *np = dev->of_node;
const struct stm32_dfsdm_dev_data *dev_data; const struct stm32_dfsdm_dev_data *dev_data;
struct iio_dev *iio; struct iio_dev *iio;
const struct of_device_id *of_id;
char *name; char *name;
int ret, irq, val; int ret, irq, val;
of_id = of_match_node(stm32_dfsdm_adc_match, np);
if (!of_id->data) {
dev_err(&pdev->dev, "Data associated to device is missing\n");
return -EINVAL;
}
dev_data = (const struct stm32_dfsdm_dev_data *)of_id->data;
dev_data = of_device_get_match_data(dev);
iio = devm_iio_device_alloc(dev, sizeof(*adc)); iio = devm_iio_device_alloc(dev, sizeof(*adc));
if (IS_ERR(iio)) { if (!iio) {
dev_err(dev, "%s: Failed to allocate IIO\n", __func__); dev_err(dev, "%s: Failed to allocate IIO\n", __func__);
return PTR_ERR(iio); return -ENOMEM;
} }
adc = iio_priv(iio); adc = iio_priv(iio);
if (IS_ERR(adc)) {
dev_err(dev, "%s: Failed to allocate ADC\n", __func__);
return PTR_ERR(adc);
}
adc->dfsdm = dev_get_drvdata(dev->parent); adc->dfsdm = dev_get_drvdata(dev->parent);
iio->dev.parent = dev; iio->dev.parent = dev;

7
drivers/iio/adc/stm32-dfsdm-core.c
View File

@ -253,13 +253,8 @@ static int stm32_dfsdm_probe(struct platform_device *pdev)
priv->pdev = pdev; priv->pdev = pdev;
of_id = of_match_node(stm32_dfsdm_of_match, pdev->dev.of_node); dev_data = of_device_get_match_data(&pdev->dev);
if (!of_id->data) {
dev_err(&pdev->dev, "Data associated to device is missing\n");
return -EINVAL;
}
dev_data = (const struct stm32_dfsdm_dev_data *)of_id->data;
dfsdm = &priv->dfsdm; dfsdm = &priv->dfsdm;
dfsdm->fl_list = devm_kcalloc(&pdev->dev, dev_data->num_filters, dfsdm->fl_list = devm_kcalloc(&pdev->dev, dev_data->num_filters,
sizeof(*dfsdm->fl_list), GFP_KERNEL); sizeof(*dfsdm->fl_list), GFP_KERNEL);