summaryrefslogtreecommitdiff
path: root/drivers/iio/adc
diff options
context:
space:
mode:
authorArnaud Pouliquen <arnaud.pouliquen@st.com>2018-01-15 09:57:39 +0100
committerMark Brown <broonie@kernel.org>2018-01-15 18:50:21 +0000
commitabaca806fd13afd069e04e883de8ec75924b0598 (patch)
treea5de7c5afe851a6086af5b67b0022006ed208b99 /drivers/iio/adc
parentd5ff18bcd4b5e66396eab7e8271172157ee1253e (diff)
IIO: ADC: stm32-dfsdm: code optimization
Use of_device_get_match_data to optimize the source code. No check is needed on dev_data as match table is defined in driver. Signed-off-by: Arnaud Pouliquen <arnaud.pouliquen@st.com> Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/iio/adc')
-rw-r--r--drivers/iio/adc/stm32-dfsdm-adc.c9
-rw-r--r--drivers/iio/adc/stm32-dfsdm-core.c8
2 files changed, 2 insertions, 15 deletions
diff --git a/drivers/iio/adc/stm32-dfsdm-adc.c b/drivers/iio/adc/stm32-dfsdm-adc.c
index 5e871404f565..3fe9b34ac6af 100644
--- a/drivers/iio/adc/stm32-dfsdm-adc.c
+++ b/drivers/iio/adc/stm32-dfsdm-adc.c
@@ -1087,18 +1087,11 @@ static int stm32_dfsdm_adc_probe(struct platform_device *pdev)
struct device_node *np = dev->of_node;
const struct stm32_dfsdm_dev_data *dev_data;
struct iio_dev *iio;
- const struct of_device_id *of_id;
char *name;
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));
if (!iio) {
dev_err(dev, "%s: Failed to allocate IIO\n", __func__);
diff --git a/drivers/iio/adc/stm32-dfsdm-core.c b/drivers/iio/adc/stm32-dfsdm-core.c
index 6cd655f8239b..6290332cfd3f 100644
--- a/drivers/iio/adc/stm32-dfsdm-core.c
+++ b/drivers/iio/adc/stm32-dfsdm-core.c
@@ -242,7 +242,6 @@ MODULE_DEVICE_TABLE(of, stm32_dfsdm_of_match);
static int stm32_dfsdm_probe(struct platform_device *pdev)
{
struct dfsdm_priv *priv;
- const struct of_device_id *of_id;
const struct stm32_dfsdm_dev_data *dev_data;
struct stm32_dfsdm *dfsdm;
int ret;
@@ -253,13 +252,8 @@ static int stm32_dfsdm_probe(struct platform_device *pdev)
priv->pdev = pdev;
- of_id = of_match_node(stm32_dfsdm_of_match, pdev->dev.of_node);
- if (!of_id->data) {
- dev_err(&pdev->dev, "Data associated to device is missing\n");
- return -EINVAL;
- }
+ dev_data = of_device_get_match_data(&pdev->dev);
- dev_data = (const struct stm32_dfsdm_dev_data *)of_id->data;
dfsdm = &priv->dfsdm;
dfsdm->fl_list = devm_kcalloc(&pdev->dev, dev_data->num_filters,
sizeof(*dfsdm->fl_list), GFP_KERNEL);