AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

staging:iio:adc:ad7291: allocate chip state with iio_dev and use iio_priv for access.

Browse Source 
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Jonathan Cameron 2011-06-27 13:07:23 +01:00 committed by Greg Kroah-Hartman
parent f4c794a2c1
commit d439797281
1 changed files with 37 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
drivers/staging/iio/adc/ad7291.c
View File

@ -61,7 +61,6 @@
struct ad7291_chip_info { struct ad7291_chip_info {
struct i2c_client *client; struct i2c_client *client;
struct iio_dev *indio_dev;
u16 command; u16 command;
u8 channels; /* Active voltage channels */ u8 channels; /* Active voltage channels */
}; };
@ -157,7 +156,7 @@ static ssize_t ad7291_show_mode(struct device *dev,
char *buf) char *buf)
{ {
struct iio_dev *dev_info = dev_get_drvdata(dev); struct iio_dev *dev_info = dev_get_drvdata(dev);
struct ad7291_chip_info *chip = dev_info->dev_data; struct ad7291_chip_info *chip = iio_priv(dev_info);
if (chip->command & AD7291_AUTOCYCLE) if (chip->command & AD7291_AUTOCYCLE)
return sprintf(buf, "autocycle\n"); return sprintf(buf, "autocycle\n");
@ -171,7 +170,7 @@ static ssize_t ad7291_store_mode(struct device *dev,
size_t len) size_t len)
{ {
struct iio_dev *dev_info = dev_get_drvdata(dev); struct iio_dev *dev_info = dev_get_drvdata(dev);
struct ad7291_chip_info *chip = dev_info->dev_data; struct ad7291_chip_info *chip = iio_priv(dev_info);
u16 command; u16 command;
int ret; int ret;
@ -208,7 +207,7 @@ static ssize_t ad7291_store_reset(struct device *dev,
size_t len) size_t len)
{ {
struct iio_dev *dev_info = dev_get_drvdata(dev); struct iio_dev *dev_info = dev_get_drvdata(dev);
struct ad7291_chip_info *chip = dev_info->dev_data; struct ad7291_chip_info *chip = iio_priv(dev_info);
u16 command; u16 command;
int ret; int ret;
@ -231,7 +230,7 @@ static ssize_t ad7291_show_ext_ref(struct device *dev,
char *buf) char *buf)
{ {
struct iio_dev *dev_info = dev_get_drvdata(dev); struct iio_dev *dev_info = dev_get_drvdata(dev);
struct ad7291_chip_info *chip = dev_info->dev_data; struct ad7291_chip_info *chip = iio_priv(dev_info);
return sprintf(buf, "%d\n", !!(chip->command & AD7291_EXT_REF)); return sprintf(buf, "%d\n", !!(chip->command & AD7291_EXT_REF));
} }
@ -242,7 +241,7 @@ static ssize_t ad7291_store_ext_ref(struct device *dev,
size_t len) size_t len)
{ {
struct iio_dev *dev_info = dev_get_drvdata(dev); struct iio_dev *dev_info = dev_get_drvdata(dev);
struct ad7291_chip_info *chip = dev_info->dev_data; struct ad7291_chip_info *chip = iio_priv(dev_info);
u16 command; u16 command;
int ret; int ret;
@ -269,7 +268,7 @@ static ssize_t ad7291_show_noise_delay(struct device *dev,
char *buf) char *buf)
{ {
struct iio_dev *dev_info = dev_get_drvdata(dev); struct iio_dev *dev_info = dev_get_drvdata(dev);
struct ad7291_chip_info *chip = dev_info->dev_data; struct ad7291_chip_info *chip = iio_priv(dev_info);
return sprintf(buf, "%d\n", !!(chip->command & AD7291_NOISE_DELAY)); return sprintf(buf, "%d\n", !!(chip->command & AD7291_NOISE_DELAY));
} }
@ -280,7 +279,7 @@ static ssize_t ad7291_store_noise_delay(struct device *dev,
size_t len) size_t len)
{ {
struct iio_dev *dev_info = dev_get_drvdata(dev); struct iio_dev *dev_info = dev_get_drvdata(dev);
struct ad7291_chip_info *chip = dev_info->dev_data; struct ad7291_chip_info *chip = iio_priv(dev_info);
u16 command; u16 command;
int ret; int ret;
@ -307,7 +306,7 @@ static ssize_t ad7291_show_t_sense(struct device *dev,
char *buf) char *buf)
{ {
struct iio_dev *dev_info = dev_get_drvdata(dev); struct iio_dev *dev_info = dev_get_drvdata(dev);
struct ad7291_chip_info *chip = dev_info->dev_data; struct ad7291_chip_info *chip = iio_priv(dev_info);
u16 data; u16 data;
char sign = ' '; char sign = ' ';
int ret; int ret;
@ -334,7 +333,7 @@ static ssize_t ad7291_show_t_average(struct device *dev,
char *buf) char *buf)
{ {
struct iio_dev *dev_info = dev_get_drvdata(dev); struct iio_dev *dev_info = dev_get_drvdata(dev);
struct ad7291_chip_info *chip = dev_info->dev_data; struct ad7291_chip_info *chip = iio_priv(dev_info);
u16 data; u16 data;
char sign = ' '; char sign = ' ';
int ret; int ret;
@ -361,7 +360,7 @@ static ssize_t ad7291_show_voltage(struct device *dev,
char *buf) char *buf)
{ {
struct iio_dev *dev_info = dev_get_drvdata(dev); struct iio_dev *dev_info = dev_get_drvdata(dev);
struct ad7291_chip_info *chip = dev_info->dev_data; struct ad7291_chip_info *chip = iio_priv(dev_info);
u16 data[AD7291_VOLTAGE_LIMIT_COUNT]; u16 data[AD7291_VOLTAGE_LIMIT_COUNT];
int i, size, ret; int i, size, ret;
@ -390,7 +389,7 @@ static ssize_t ad7291_show_channel_mask(struct device *dev,
char *buf) char *buf)
{ {
struct iio_dev *dev_info = dev_get_drvdata(dev); struct iio_dev *dev_info = dev_get_drvdata(dev);
struct ad7291_chip_info *chip = dev_info->dev_data; struct ad7291_chip_info *chip = iio_priv(dev_info);
return sprintf(buf, "0x%x\n", (chip->command & AD7291_VOLTAGE_MASK) >> return sprintf(buf, "0x%x\n", (chip->command & AD7291_VOLTAGE_MASK) >>
AD7291_VOLTAGE_OFFSET); AD7291_VOLTAGE_OFFSET);
@ -402,7 +401,7 @@ static ssize_t ad7291_store_channel_mask(struct device *dev,
size_t len) size_t len)
{ {
struct iio_dev *dev_info = dev_get_drvdata(dev); struct iio_dev *dev_info = dev_get_drvdata(dev);
struct ad7291_chip_info *chip = dev_info->dev_data; struct ad7291_chip_info *chip = iio_priv(dev_info);
u16 command; u16 command;
unsigned long data; unsigned long data;
int i, ret; int i, ret;
@ -457,7 +456,7 @@ static const struct attribute_group ad7291_attribute_group = {
static irqreturn_t ad7291_event_handler(int irq, void *private) static irqreturn_t ad7291_event_handler(int irq, void *private)
{ {
struct iio_dev *indio_dev = private; struct iio_dev *indio_dev = private;
struct ad7291_chip_info *chip = iio_dev_get_devdata(private); struct ad7291_chip_info *chip = iio_priv(private);
u16 t_status, v_status; u16 t_status, v_status;
u16 command; u16 command;
int i; int i;
@ -532,7 +531,7 @@ static inline ssize_t ad7291_show_t_bound(struct device *dev,
char *buf) char *buf)
{ {
struct iio_dev *dev_info = dev_get_drvdata(dev); struct iio_dev *dev_info = dev_get_drvdata(dev);
struct ad7291_chip_info *chip = dev_info->dev_data; struct ad7291_chip_info *chip = iio_priv(dev_info);
struct iio_dev_attr *this_attr = to_iio_dev_attr(attr); struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
u16 data; u16 data;
char sign = ' '; char sign = ' ';
@ -560,7 +559,7 @@ static inline ssize_t ad7291_set_t_bound(struct device *dev,
size_t len) size_t len)
{ {
struct iio_dev *dev_info = dev_get_drvdata(dev); struct iio_dev *dev_info = dev_get_drvdata(dev);
struct ad7291_chip_info *chip = dev_info->dev_data; struct ad7291_chip_info *chip = iio_priv(dev_info);
struct iio_dev_attr *this_attr = to_iio_dev_attr(attr); struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
long tmp1, tmp2; long tmp1, tmp2;
u16 data; u16 data;
@ -608,7 +607,7 @@ static inline ssize_t ad7291_show_v_bound(struct device *dev,
char *buf) char *buf)
{ {
struct iio_dev *dev_info = dev_get_drvdata(dev); struct iio_dev *dev_info = dev_get_drvdata(dev);
struct ad7291_chip_info *chip = dev_info->dev_data; struct ad7291_chip_info *chip = iio_priv(dev_info);
u16 data; u16 data;
int ret; int ret;
@ -633,7 +632,7 @@ static inline ssize_t ad7291_set_v_bound(struct device *dev,
size_t len) size_t len)
{ {
struct iio_dev *dev_info = dev_get_drvdata(dev); struct iio_dev *dev_info = dev_get_drvdata(dev);
struct ad7291_chip_info *chip = dev_info->dev_data; struct ad7291_chip_info *chip = iio_priv(dev_info);
unsigned long value; unsigned long value;
u16 data; u16 data;
int ret; int ret;
@ -792,32 +791,26 @@ static int __devinit ad7291_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct ad7291_chip_info *chip; struct ad7291_chip_info *chip;
struct iio_dev *indio_dev;
int ret = 0; int ret = 0;
chip = kzalloc(sizeof(struct ad7291_chip_info), GFP_KERNEL); indio_dev = iio_allocate_device(sizeof(*chip));
if (indio_dev == NULL) {
if (chip == NULL) ret = -ENOMEM;
return -ENOMEM; goto error_ret;
}
/* this is only used for device removal purposes */ /* this is only used for device removal purposes */
i2c_set_clientdata(client, chip); i2c_set_clientdata(client, indio_dev);
chip->client = client; chip->client = client;
chip->command = AD7291_NOISE_DELAY | AD7291_T_SENSE_MASK; chip->command = AD7291_NOISE_DELAY | AD7291_T_SENSE_MASK;
chip->indio_dev = iio_allocate_device(0); indio_dev->name = id->name;
if (chip->indio_dev == NULL) { indio_dev->dev.parent = &client->dev;
ret = -ENOMEM; indio_dev->info = &ad7291_info;
goto error_free_chip; indio_dev->modes = INDIO_DIRECT_MODE;
}
chip->indio_dev->name = id->name; ret = iio_device_register(indio_dev);
chip->indio_dev->dev.parent = &client->dev;
chip->indio_dev->info = &ad7291_info;
chip->indio_dev->dev_data = (void *)chip;
chip->indio_dev->modes = INDIO_DIRECT_MODE;
ret = iio_device_register(chip->indio_dev);
if (ret) if (ret)
goto error_free_dev; goto error_free_dev;
@ -827,7 +820,7 @@ static int __devinit ad7291_probe(struct i2c_client *client,
&ad7291_event_handler, &ad7291_event_handler,
IRQF_TRIGGER_LOW | IRQF_ONESHOT, IRQF_TRIGGER_LOW | IRQF_ONESHOT,
id->name, id->name,
chip->indio_dev); indio_dev);
if (ret) if (ret)
goto error_unreg_dev; goto error_unreg_dev;
@ -847,27 +840,23 @@ static int __devinit ad7291_probe(struct i2c_client *client,
return 0; return 0;
error_unreg_irq: error_unreg_irq:
free_irq(client->irq, chip->indio_dev); free_irq(client->irq, indio_dev);
error_unreg_dev: error_unreg_dev:
iio_device_unregister(chip->indio_dev); iio_device_unregister(indio_dev);
error_free_dev: error_free_dev:
iio_free_device(chip->indio_dev); iio_free_device(indio_dev);
error_free_chip: error_ret:
kfree(chip);
return ret; return ret;
} }
static int __devexit ad7291_remove(struct i2c_client *client) static int __devexit ad7291_remove(struct i2c_client *client)
{ {
struct ad7291_chip_info *chip = i2c_get_clientdata(client); struct iio_dev *indio_dev = i2c_get_clientdata(client);
struct iio_dev *indio_dev = chip->indio_dev;
if (client->irq) if (client->irq)
free_irq(client->irq, chip->indio_dev); free_irq(client->irq, indio_dev);
iio_device_unregister(indio_dev); iio_device_unregister(indio_dev);
iio_free_device(chip->indio_dev); iio_free_device(indio_dev);
kfree(chip);
return 0; return 0;
} }