renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-24 05:04:00 +08:00
Code

staging:iio:adc:spear rename iodev -> indio_dev to fit with current convention

Browse Source 
How we ended up with indio_dev is a mystery, but we have so in the interests
of consistency, move this driver over to that convention.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Hartmut Knaack <knaack.h@gmx.de>
This commit is contained in:
Jonathan Cameron 2014-05-04 17:45:00 +01:00
parent b586e5d9ee
commit e90ba52f4d
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/staging/iio/adc/spear_adc.c
View File

@ -262,17 +262,17 @@ static int spear_adc_probe(struct platform_device *pdev)
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct spear_adc_state *st; struct spear_adc_state *st;
struct iio_dev *iodev = NULL; struct iio_dev *indio_dev = NULL;
int ret = -ENODEV; int ret = -ENODEV;
int irq; int irq;
iodev = devm_iio_device_alloc(dev, sizeof(struct spear_adc_state)); indio_dev = devm_iio_device_alloc(dev, sizeof(struct spear_adc_state));
if (!iodev) { if (!indio_dev) {
dev_err(dev, "failed allocating iio device\n"); dev_err(dev, "failed allocating iio device\n");
return -ENOMEM; return -ENOMEM;
} }
st = iio_priv(iodev); st = iio_priv(indio_dev);
st->np = np; st->np = np;
/* /*
@ -335,18 +335,18 @@ static int spear_adc_probe(struct platform_device *pdev)
spear_adc_configure(st); spear_adc_configure(st);
platform_set_drvdata(pdev, iodev); platform_set_drvdata(pdev, indio_dev);
init_completion(&st->completion); init_completion(&st->completion);
iodev->name = SPEAR_ADC_MOD_NAME; indio_dev->name = SPEAR_ADC_MOD_NAME;
iodev->dev.parent = dev; indio_dev->dev.parent = dev;
iodev->info = &spear_adc_info; indio_dev->info = &spear_adc_info;
iodev->modes = INDIO_DIRECT_MODE; indio_dev->modes = INDIO_DIRECT_MODE;
iodev->channels = spear_adc_iio_channels; indio_dev->channels = spear_adc_iio_channels;
iodev->num_channels = ARRAY_SIZE(spear_adc_iio_channels); indio_dev->num_channels = ARRAY_SIZE(spear_adc_iio_channels);
ret = iio_device_register(iodev); ret = iio_device_register(indio_dev);
if (ret) if (ret)
goto errout3; goto errout3;
@ -365,10 +365,10 @@ errout1:
static int spear_adc_remove(struct platform_device *pdev) static int spear_adc_remove(struct platform_device *pdev)
{ {
struct iio_dev *iodev = platform_get_drvdata(pdev); struct iio_dev *indio_dev = platform_get_drvdata(pdev);
struct spear_adc_state *st = iio_priv(iodev); struct spear_adc_state *st = iio_priv(indio_dev);
iio_device_unregister(iodev); iio_device_unregister(indio_dev);
clk_disable_unprepare(st->clk); clk_disable_unprepare(st->clk);
clk_put(st->clk); clk_put(st->clk);
iounmap(st->adc_base_spear6xx); iounmap(st->adc_base_spear6xx);