summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMartin Blumenstingl <martin.blumenstingl@googlemail.com>2018-09-23 00:21:01 +0200
committerJonathan Cameron <Jonathan.Cameron@huawei.com>2018-09-29 12:26:08 +0100
commit234c64a290cb6ec79a2b1ac289a1713dc9f7890e (patch)
tree524c39250f3abf9961b5c1cbeea8bd9530e8fb4c /drivers
parent3d9bf07a72f9257f081be7d4381cb70cf0d9426e (diff)
downloadblackbird-op-linux-234c64a290cb6ec79a2b1ac289a1713dc9f7890e.tar.gz
blackbird-op-linux-234c64a290cb6ec79a2b1ac289a1713dc9f7890e.zip
iio: adc: meson-saradc: use of_device_get_match_data
This simplifies our _probe function by using of_device_get_match_data instead of open-coding it. No functional changes. Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/iio/adc/meson_saradc.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/iio/adc/meson_saradc.c b/drivers/iio/adc/meson_saradc.c
index b97b06bf7713..9d8f2139debc 100644
--- a/drivers/iio/adc/meson_saradc.c
+++ b/drivers/iio/adc/meson_saradc.c
@@ -978,11 +978,11 @@ MODULE_DEVICE_TABLE(of, meson_sar_adc_of_match);
static int meson_sar_adc_probe(struct platform_device *pdev)
{
+ const struct meson_sar_adc_data *match_data;
struct meson_sar_adc_priv *priv;
struct iio_dev *indio_dev;
struct resource *res;
void __iomem *base;
- const struct of_device_id *match;
int irq, ret;
indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*priv));
@@ -994,13 +994,13 @@ static int meson_sar_adc_probe(struct platform_device *pdev)
priv = iio_priv(indio_dev);
init_completion(&priv->done);
- match = of_match_device(meson_sar_adc_of_match, &pdev->dev);
- if (!match) {
- dev_err(&pdev->dev, "failed to match device\n");
+ match_data = of_device_get_match_data(&pdev->dev);
+ if (!match_data) {
+ dev_err(&pdev->dev, "failed to get match data\n");
return -ENODEV;
}
- priv->data = match->data;
+ priv->data = match_data;
indio_dev->name = priv->data->name;
indio_dev->dev.parent = &pdev->dev;
OpenPOWER on IntegriCloud