Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 259615
b: refs/heads/master
c: a3684de
h: refs/heads/master
i:
  259613: 68d75bc
  259611: 78be804
  259607: b312648
  259599: 31ccab9
  259583: 9d85a6b
v: v3
  • Loading branch information
Jonathan Cameron authored and Greg Kroah-Hartman committed Jun 28, 2011
1 parent 0d5eba9 commit 43def53
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 51 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3ff242055b7b460b6646238a26f3330be6a22651
refs/heads/master: a3684ded4fdd1ee7b5bee84e2aa96586f47fb07f
89 changes: 41 additions & 48 deletions trunk/drivers/staging/iio/dac/ad5504.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ static ssize_t ad5504_write_dac(struct device *dev,
const char *buf, size_t len)
{
struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct ad5504_state *st = iio_dev_get_devdata(indio_dev);
struct ad5504_state *st = iio_priv(indio_dev);
struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
long readin;
int ret;
Expand All @@ -73,7 +73,7 @@ static ssize_t ad5504_read_dac(struct device *dev,
char *buf)
{
struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct ad5504_state *st = iio_dev_get_devdata(indio_dev);
struct ad5504_state *st = iio_priv(indio_dev);
struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
int ret;
u16 val;
Expand All @@ -89,7 +89,7 @@ static ssize_t ad5504_read_powerdown_mode(struct device *dev,
struct device_attribute *attr, char *buf)
{
struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct ad5504_state *st = iio_dev_get_devdata(indio_dev);
struct ad5504_state *st = iio_priv(indio_dev);

const char mode[][14] = {"20kohm_to_gnd", "three_state"};

Expand All @@ -101,7 +101,7 @@ static ssize_t ad5504_write_powerdown_mode(struct device *dev,
const char *buf, size_t len)
{
struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct ad5504_state *st = iio_dev_get_devdata(indio_dev);
struct ad5504_state *st = iio_priv(indio_dev);
int ret;

if (sysfs_streq(buf, "20kohm_to_gnd"))
Expand All @@ -119,7 +119,7 @@ static ssize_t ad5504_read_dac_powerdown(struct device *dev,
char *buf)
{
struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct ad5504_state *st = iio_dev_get_devdata(indio_dev);
struct ad5504_state *st = iio_priv(indio_dev);
struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);

return sprintf(buf, "%d\n",
Expand All @@ -133,7 +133,7 @@ static ssize_t ad5504_write_dac_powerdown(struct device *dev,
long readin;
int ret;
struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct ad5504_state *st = iio_dev_get_devdata(indio_dev);
struct ad5504_state *st = iio_priv(indio_dev);
struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);

ret = strict_strtol(buf, 10, &readin);
Expand Down Expand Up @@ -162,7 +162,7 @@ static ssize_t ad5504_show_scale(struct device *dev,
char *buf)
{
struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct ad5504_state *st = iio_dev_get_devdata(indio_dev);
struct ad5504_state *st = iio_priv(indio_dev);
/* Corresponds to Vref / 2^(bits) */
unsigned int scale_uv = (st->vref_mv * 1000) >> AD5505_BITS;

Expand Down Expand Up @@ -277,49 +277,45 @@ static const struct iio_info ad5501_info = {
static int __devinit ad5504_probe(struct spi_device *spi)
{
struct ad5504_platform_data *pdata = spi->dev.platform_data;
struct iio_dev *indio_dev;
struct ad5504_state *st;
struct regulator *reg;
int ret, voltage_uv = 0;

st = kzalloc(sizeof(*st), GFP_KERNEL);
if (st == NULL) {
ret = -ENOMEM;
goto error_ret;
}

spi_set_drvdata(spi, st);

st->reg = regulator_get(&spi->dev, "vcc");
if (!IS_ERR(st->reg)) {
ret = regulator_enable(st->reg);
reg = regulator_get(&spi->dev, "vcc");
if (!IS_ERR(reg)) {
ret = regulator_enable(reg);
if (ret)
goto error_put_reg;

voltage_uv = regulator_get_voltage(st->reg);
voltage_uv = regulator_get_voltage(reg);
}

indio_dev = iio_allocate_device(sizeof(*st));
if (indio_dev == NULL) {
ret = -ENOMEM;
goto error_disable_reg;
}
spi_set_drvdata(spi, indio_dev);
st = iio_priv(indio_dev);
if (voltage_uv)
st->vref_mv = voltage_uv / 1000;
else if (pdata)
st->vref_mv = pdata->vref_mv;
else
dev_warn(&spi->dev, "reference voltage unspecified\n");

st->reg = reg;
st->spi = spi;
st->indio_dev = iio_allocate_device(0);
if (st->indio_dev == NULL) {
ret = -ENOMEM;
goto error_disable_reg;
}
st->indio_dev->dev.parent = &spi->dev;
st->indio_dev->name = spi_get_device_id(st->spi)->name;
indio_dev->dev.parent = &spi->dev;
indio_dev->name = spi_get_device_id(st->spi)->name;
if (spi_get_device_id(st->spi)->driver_data == ID_AD5501)
st->indio_dev->info = &ad5501_info;
indio_dev->info = &ad5501_info;
else
st->indio_dev->info = &ad5504_info;
st->indio_dev->dev_data = (void *)(st);
st->indio_dev->modes = INDIO_DIRECT_MODE;
indio_dev->info = &ad5504_info;
indio_dev->modes = INDIO_DIRECT_MODE;

ret = iio_device_register(st->indio_dev);
ret = iio_device_register(indio_dev);
if (ret)
goto error_free_dev;

Expand All @@ -329,45 +325,42 @@ static int __devinit ad5504_probe(struct spi_device *spi)
&ad5504_event_handler,
IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
spi_get_device_id(st->spi)->name,
st->indio_dev);
indio_dev);
if (ret)
goto error_unreg_iio_device;
}

return 0;

error_unreg_iio_device:
iio_device_unregister(st->indio_dev);
iio_device_unregister(indio_dev);
error_free_dev:
iio_free_device(st->indio_dev);
iio_free_device(indio_dev);
error_disable_reg:
if (!IS_ERR(st->reg))
if (!IS_ERR(reg))
regulator_disable(st->reg);
error_put_reg:
if (!IS_ERR(st->reg))
regulator_put(st->reg);
if (!IS_ERR(reg))
regulator_put(reg);

kfree(st);
error_ret:
return ret;
}

static int __devexit ad5504_remove(struct spi_device *spi)
{
struct ad5504_state *st = spi_get_drvdata(spi);

struct iio_dev *indio_dev = spi_get_drvdata(spi);
struct ad5504_state *st = iio_priv(indio_dev);
struct regulator *reg = st->reg;
if (spi->irq)
free_irq(spi->irq, st->indio_dev);
free_irq(spi->irq, indio_dev);

iio_device_unregister(st->indio_dev);
iio_device_unregister(indio_dev);

if (!IS_ERR(st->reg)) {
regulator_disable(st->reg);
regulator_put(st->reg);
if (!IS_ERR(reg)) {
regulator_disable(reg);
regulator_put(reg);
}

kfree(st);

return 0;
}

Expand Down
2 changes: 0 additions & 2 deletions trunk/drivers/staging/iio/dac/ad5504.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ struct ad5504_platform_data {

/**
* struct ad5446_state - driver instance specific data
* @indio_dev: the industrial I/O device
* @us: spi_device
* @reg: supply regulator
* @vref_mv: actual reference voltage used
Expand All @@ -50,7 +49,6 @@ struct ad5504_platform_data {
*/

struct ad5504_state {
struct iio_dev *indio_dev;
struct spi_device *spi;
struct regulator *reg;
unsigned short vref_mv;
Expand Down

0 comments on commit 43def53

Please sign in to comment.