Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 219917
b: refs/heads/master
c: 8d9c636
h: refs/heads/master
i:
  219915: 0177563
v: v3
  • Loading branch information
Jonathan Cameron authored and Greg Kroah-Hartman committed Sep 21, 2010
1 parent 43a8a13 commit 9e7a023
Show file tree
Hide file tree
Showing 2 changed files with 93 additions and 56 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: 6a36e618b4b98dc43e67b03cd01ad7a3c41a06e5
refs/heads/master: 8d9c636b60434fd5f7453937e7d2139757481574
147 changes: 92 additions & 55 deletions trunk/drivers/staging/iio/adc/max1363_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,17 +148,57 @@ const struct max1363_mode
return NULL;
}

static ssize_t max1363_show_precision(struct device *dev,
static ssize_t max1363_show_precision_u(struct device *dev,
struct device_attribute *attr,
char *buf)
{
struct iio_dev *dev_info = dev_get_drvdata(dev);
struct max1363_state *st = iio_dev_get_devdata(dev_info);
return sprintf(buf, "%d\n", st->chip_info->bits);
return sprintf(buf, "u%d/16\n", st->chip_info->bits);
}

static IIO_DEVICE_ATTR(in_precision, S_IRUGO, max1363_show_precision,
NULL, 0);
static ssize_t max1363_show_precision_s(struct device *dev,
struct device_attribute *attr,
char *buf)
{
struct iio_dev *dev_info = dev_get_drvdata(dev);
struct max1363_state *st = iio_dev_get_devdata(dev_info);
return sprintf(buf, "s%d/16\n", st->chip_info->bits);
}

#define MAX1363_SCAN_TYPE(n) \
DEVICE_ATTR(in##n##_type, S_IRUGO, \
max1363_show_precision_u, NULL);
#define MAX1363_SCAN_TYPE_D(p, n) \
struct device_attribute dev_attr_in##p##m##in##n##_type = \
__ATTR(in##p-in##n##_type, S_IRUGO, \
max1363_show_precision_s, NULL);

static MAX1363_SCAN_TYPE(0);
static MAX1363_SCAN_TYPE(1);
static MAX1363_SCAN_TYPE(2);
static MAX1363_SCAN_TYPE(3);
static MAX1363_SCAN_TYPE(4);
static MAX1363_SCAN_TYPE(5);
static MAX1363_SCAN_TYPE(6);
static MAX1363_SCAN_TYPE(7);
static MAX1363_SCAN_TYPE(8);
static MAX1363_SCAN_TYPE(9);
static MAX1363_SCAN_TYPE(10);
static MAX1363_SCAN_TYPE(11);

static MAX1363_SCAN_TYPE_D(0, 1);
static MAX1363_SCAN_TYPE_D(2, 3);
static MAX1363_SCAN_TYPE_D(4, 5);
static MAX1363_SCAN_TYPE_D(6, 7);
static MAX1363_SCAN_TYPE_D(8, 9);
static MAX1363_SCAN_TYPE_D(10, 11);
static MAX1363_SCAN_TYPE_D(1, 0);
static MAX1363_SCAN_TYPE_D(3, 2);
static MAX1363_SCAN_TYPE_D(5, 4);
static MAX1363_SCAN_TYPE_D(7, 6);
static MAX1363_SCAN_TYPE_D(9, 8);
static MAX1363_SCAN_TYPE_D(11, 10);

static int max1363_write_basic_config(struct i2c_client *client,
unsigned char d1,
Expand Down Expand Up @@ -345,15 +385,14 @@ static struct attribute_group max1363_dev_attr_group = {
};

static struct attribute *max1363_scan_el_attrs[] = {
&iio_scan_el_in0.dev_attr.attr,
&iio_scan_el_in1.dev_attr.attr,
&iio_scan_el_in2.dev_attr.attr,
&iio_scan_el_in3.dev_attr.attr,
&iio_scan_el_in0min1.dev_attr.attr,
&iio_scan_el_in2min3.dev_attr.attr,
&iio_scan_el_in1min0.dev_attr.attr,
&iio_scan_el_in3min2.dev_attr.attr,
&iio_dev_attr_in_precision.dev_attr.attr,
&iio_scan_el_in0.dev_attr.attr, &dev_attr_in0_type.attr,
&iio_scan_el_in1.dev_attr.attr, &dev_attr_in1_type.attr,
&iio_scan_el_in2.dev_attr.attr, &dev_attr_in2_type.attr,
&iio_scan_el_in3.dev_attr.attr, &dev_attr_in3_type.attr,
&iio_scan_el_in0min1.dev_attr.attr, &dev_attr_in0min1_type.attr,
&iio_scan_el_in2min3.dev_attr.attr, &dev_attr_in2min3_type.attr,
&iio_scan_el_in1min0.dev_attr.attr, &dev_attr_in1min0_type.attr,
&iio_scan_el_in3min2.dev_attr.attr, &dev_attr_in3min2_type.attr,
NULL,
};

Expand Down Expand Up @@ -419,31 +458,30 @@ static struct attribute_group max1238_dev_attr_group = {
};

static struct attribute *max1238_scan_el_attrs[] = {
&iio_scan_el_in0.dev_attr.attr,
&iio_scan_el_in1.dev_attr.attr,
&iio_scan_el_in2.dev_attr.attr,
&iio_scan_el_in3.dev_attr.attr,
&iio_scan_el_in4.dev_attr.attr,
&iio_scan_el_in5.dev_attr.attr,
&iio_scan_el_in6.dev_attr.attr,
&iio_scan_el_in7.dev_attr.attr,
&iio_scan_el_in8.dev_attr.attr,
&iio_scan_el_in9.dev_attr.attr,
&iio_scan_el_in10.dev_attr.attr,
&iio_scan_el_in11.dev_attr.attr,
&iio_scan_el_in0min1.dev_attr.attr,
&iio_scan_el_in2min3.dev_attr.attr,
&iio_scan_el_in4min5.dev_attr.attr,
&iio_scan_el_in6min7.dev_attr.attr,
&iio_scan_el_in8min9.dev_attr.attr,
&iio_scan_el_in10min11.dev_attr.attr,
&iio_scan_el_in1min0.dev_attr.attr,
&iio_scan_el_in3min2.dev_attr.attr,
&iio_scan_el_in5min4.dev_attr.attr,
&iio_scan_el_in7min6.dev_attr.attr,
&iio_scan_el_in9min8.dev_attr.attr,
&iio_scan_el_in11min10.dev_attr.attr,
&iio_dev_attr_in_precision.dev_attr.attr,
&iio_scan_el_in0.dev_attr.attr, &dev_attr_in0_type.attr,
&iio_scan_el_in1.dev_attr.attr, &dev_attr_in1_type.attr,
&iio_scan_el_in2.dev_attr.attr, &dev_attr_in2_type.attr,
&iio_scan_el_in3.dev_attr.attr, &dev_attr_in3_type.attr,
&iio_scan_el_in4.dev_attr.attr, &dev_attr_in4_type.attr,
&iio_scan_el_in5.dev_attr.attr, &dev_attr_in5_type.attr,
&iio_scan_el_in6.dev_attr.attr, &dev_attr_in6_type.attr,
&iio_scan_el_in7.dev_attr.attr, &dev_attr_in7_type.attr,
&iio_scan_el_in8.dev_attr.attr, &dev_attr_in8_type.attr,
&iio_scan_el_in9.dev_attr.attr, &dev_attr_in9_type.attr,
&iio_scan_el_in10.dev_attr.attr, &dev_attr_in10_type.attr,
&iio_scan_el_in11.dev_attr.attr, &dev_attr_in11_type.attr,
&iio_scan_el_in0min1.dev_attr.attr, &dev_attr_in0min1_type.attr,
&iio_scan_el_in2min3.dev_attr.attr, &dev_attr_in2min3_type.attr,
&iio_scan_el_in4min5.dev_attr.attr, &dev_attr_in4min5_type.attr,
&iio_scan_el_in6min7.dev_attr.attr, &dev_attr_in6min7_type.attr,
&iio_scan_el_in8min9.dev_attr.attr, &dev_attr_in8min9_type.attr,
&iio_scan_el_in10min11.dev_attr.attr, &dev_attr_in10min11_type.attr,
&iio_scan_el_in1min0.dev_attr.attr, &dev_attr_in1min0_type.attr,
&iio_scan_el_in3min2.dev_attr.attr, &dev_attr_in3min2_type.attr,
&iio_scan_el_in5min4.dev_attr.attr, &dev_attr_in5min4_type.attr,
&iio_scan_el_in7min6.dev_attr.attr, &dev_attr_in7min6_type.attr,
&iio_scan_el_in9min8.dev_attr.attr, &dev_attr_in9min8_type.attr,
&iio_scan_el_in11min10.dev_attr.attr, &dev_attr_in11min10_type.attr,
NULL,
};

Expand Down Expand Up @@ -498,23 +536,22 @@ static struct attribute_group max11608_dev_attr_group = {
};

static struct attribute *max11608_scan_el_attrs[] = {
&iio_scan_el_in0.dev_attr.attr,
&iio_scan_el_in1.dev_attr.attr,
&iio_scan_el_in2.dev_attr.attr,
&iio_scan_el_in3.dev_attr.attr,
&iio_scan_el_in4.dev_attr.attr,
&iio_scan_el_in5.dev_attr.attr,
&iio_scan_el_in6.dev_attr.attr,
&iio_scan_el_in7.dev_attr.attr,
&iio_scan_el_in0min1.dev_attr.attr,
&iio_scan_el_in2min3.dev_attr.attr,
&iio_scan_el_in4min5.dev_attr.attr,
&iio_scan_el_in6min7.dev_attr.attr,
&iio_scan_el_in1min0.dev_attr.attr,
&iio_scan_el_in3min2.dev_attr.attr,
&iio_scan_el_in5min4.dev_attr.attr,
&iio_scan_el_in7min6.dev_attr.attr,
&iio_dev_attr_in_precision.dev_attr.attr,
&iio_scan_el_in0.dev_attr.attr, &dev_attr_in0_type.attr,
&iio_scan_el_in1.dev_attr.attr, &dev_attr_in1_type.attr,
&iio_scan_el_in2.dev_attr.attr, &dev_attr_in2_type.attr,
&iio_scan_el_in3.dev_attr.attr, &dev_attr_in3_type.attr,
&iio_scan_el_in4.dev_attr.attr, &dev_attr_in4_type.attr,
&iio_scan_el_in5.dev_attr.attr, &dev_attr_in5_type.attr,
&iio_scan_el_in6.dev_attr.attr, &dev_attr_in6_type.attr,
&iio_scan_el_in7.dev_attr.attr, &dev_attr_in7_type.attr,
&iio_scan_el_in0min1.dev_attr.attr, &dev_attr_in0min1_type.attr,
&iio_scan_el_in2min3.dev_attr.attr, &dev_attr_in2min3_type.attr,
&iio_scan_el_in4min5.dev_attr.attr, &dev_attr_in4min5_type.attr,
&iio_scan_el_in6min7.dev_attr.attr, &dev_attr_in6min7_type.attr,
&iio_scan_el_in1min0.dev_attr.attr, &dev_attr_in1min0_type.attr,
&iio_scan_el_in3min2.dev_attr.attr, &dev_attr_in3min2_type.attr,
&iio_scan_el_in5min4.dev_attr.attr, &dev_attr_in5min4_type.attr,
&iio_scan_el_in7min6.dev_attr.attr, &dev_attr_in7min6_type.attr,
};

static struct attribute_group max11608_scan_el_group = {
Expand Down

0 comments on commit 9e7a023

Please sign in to comment.