Commit a0b4ddda authored by Fuqian Huang's avatar Fuqian Huang Committed by Jonathan Cameron

iio: adc: sc27xx: Introduce local variable 'struct device *dev'

Introduce local variable 'struct device *dev' and use it instead of
dereferencing it repeatly.
Signed-off-by: default avatarFuqian Huang <huangfq.daxian@gmail.com>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 8e97d4c8
...@@ -504,88 +504,89 @@ static void sc27xx_adc_free_hwlock(void *_data) ...@@ -504,88 +504,89 @@ static void sc27xx_adc_free_hwlock(void *_data)
static int sc27xx_adc_probe(struct platform_device *pdev) static int sc27xx_adc_probe(struct platform_device *pdev)
{ {
struct device_node *np = pdev->dev.of_node; struct device *dev = &pdev->dev;
struct device_node *np = dev->of_node;
struct sc27xx_adc_data *sc27xx_data; struct sc27xx_adc_data *sc27xx_data;
struct iio_dev *indio_dev; struct iio_dev *indio_dev;
int ret; int ret;
indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*sc27xx_data)); indio_dev = devm_iio_device_alloc(dev, sizeof(*sc27xx_data));
if (!indio_dev) if (!indio_dev)
return -ENOMEM; return -ENOMEM;
sc27xx_data = iio_priv(indio_dev); sc27xx_data = iio_priv(indio_dev);
sc27xx_data->regmap = dev_get_regmap(pdev->dev.parent, NULL); sc27xx_data->regmap = dev_get_regmap(dev->parent, NULL);
if (!sc27xx_data->regmap) { if (!sc27xx_data->regmap) {
dev_err(&pdev->dev, "failed to get ADC regmap\n"); dev_err(dev, "failed to get ADC regmap\n");
return -ENODEV; return -ENODEV;
} }
ret = of_property_read_u32(np, "reg", &sc27xx_data->base); ret = of_property_read_u32(np, "reg", &sc27xx_data->base);
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to get ADC base address\n"); dev_err(dev, "failed to get ADC base address\n");
return ret; return ret;
} }
sc27xx_data->irq = platform_get_irq(pdev, 0); sc27xx_data->irq = platform_get_irq(pdev, 0);
if (sc27xx_data->irq < 0) { if (sc27xx_data->irq < 0) {
dev_err(&pdev->dev, "failed to get ADC irq number\n"); dev_err(dev, "failed to get ADC irq number\n");
return sc27xx_data->irq; return sc27xx_data->irq;
} }
ret = of_hwspin_lock_get_id(np, 0); ret = of_hwspin_lock_get_id(np, 0);
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "failed to get hwspinlock id\n"); dev_err(dev, "failed to get hwspinlock id\n");
return ret; return ret;
} }
sc27xx_data->hwlock = hwspin_lock_request_specific(ret); sc27xx_data->hwlock = hwspin_lock_request_specific(ret);
if (!sc27xx_data->hwlock) { if (!sc27xx_data->hwlock) {
dev_err(&pdev->dev, "failed to request hwspinlock\n"); dev_err(dev, "failed to request hwspinlock\n");
return -ENXIO; return -ENXIO;
} }
ret = devm_add_action(&pdev->dev, sc27xx_adc_free_hwlock, ret = devm_add_action(dev, sc27xx_adc_free_hwlock,
sc27xx_data->hwlock); sc27xx_data->hwlock);
if (ret) { if (ret) {
sc27xx_adc_free_hwlock(sc27xx_data->hwlock); sc27xx_adc_free_hwlock(sc27xx_data->hwlock);
dev_err(&pdev->dev, "failed to add hwspinlock action\n"); dev_err(dev, "failed to add hwspinlock action\n");
return ret; return ret;
} }
init_completion(&sc27xx_data->completion); init_completion(&sc27xx_data->completion);
sc27xx_data->dev = &pdev->dev; sc27xx_data->dev = dev;
ret = sc27xx_adc_enable(sc27xx_data); ret = sc27xx_adc_enable(sc27xx_data);
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to enable ADC module\n"); dev_err(dev, "failed to enable ADC module\n");
return ret; return ret;
} }
ret = devm_add_action(&pdev->dev, sc27xx_adc_disable, sc27xx_data); ret = devm_add_action(dev, sc27xx_adc_disable, sc27xx_data);
if (ret) { if (ret) {
sc27xx_adc_disable(sc27xx_data); sc27xx_adc_disable(sc27xx_data);
dev_err(&pdev->dev, "failed to add ADC disable action\n"); dev_err(dev, "failed to add ADC disable action\n");
return ret; return ret;
} }
ret = devm_request_threaded_irq(&pdev->dev, sc27xx_data->irq, NULL, ret = devm_request_threaded_irq(dev, sc27xx_data->irq, NULL,
sc27xx_adc_isr, IRQF_ONESHOT, sc27xx_adc_isr, IRQF_ONESHOT,
pdev->name, sc27xx_data); pdev->name, sc27xx_data);
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to request ADC irq\n"); dev_err(dev, "failed to request ADC irq\n");
return ret; return ret;
} }
indio_dev->dev.parent = &pdev->dev; indio_dev->dev.parent = dev;
indio_dev->name = dev_name(&pdev->dev); indio_dev->name = dev_name(dev);
indio_dev->modes = INDIO_DIRECT_MODE; indio_dev->modes = INDIO_DIRECT_MODE;
indio_dev->info = &sc27xx_info; indio_dev->info = &sc27xx_info;
indio_dev->channels = sc27xx_channels; indio_dev->channels = sc27xx_channels;
indio_dev->num_channels = ARRAY_SIZE(sc27xx_channels); indio_dev->num_channels = ARRAY_SIZE(sc27xx_channels);
ret = devm_iio_device_register(&pdev->dev, indio_dev); ret = devm_iio_device_register(dev, indio_dev);
if (ret) if (ret)
dev_err(&pdev->dev, "could not register iio (ADC)"); dev_err(dev, "could not register iio (ADC)");
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment