Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-01 01:31:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging: iio: hmc5843 change ABI to comply with documentation

Browse Source 
this one completes my last patch set to compile fine for all drivers.

Signed-off-by: Manuel Stahl <manuel.stahl@iis.fraunhofer.de>
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Datta, Shubhrajyoti <shubhrajyoti@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Manuel Stahl 2010-08-31 14:27:33 +02:00 committed by Greg Kroah-Hartman
parent 4f64b80144
commit 11f05c7715
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/staging/iio/magnetometer/hmc5843.c
View File

@ -95,15 +95,15 @@
#define CONF_NOT_USED 0x03 #define CONF_NOT_USED 0x03
#define MEAS_CONF_MASK 0x03 #define MEAS_CONF_MASK 0x03
static const int regval_to_counts_per_mg[] = { static const char *regval_to_scale[] = {
1620, "0.0000006173",
1300, "0.0000007692",
970, "0.0000010309",
780, "0.0000012821",
530, "0.0000018868",
460, "0.0000021739",
390, "0.0000025641",
280 "0.0000035714",
}; };
static const int regval_to_input_field_mg[] = { static const int regval_to_input_field_mg[] = {
700, 700,
@ -326,7 +326,7 @@ static IIO_DEVICE_ATTR(meas_conf,
* 6 | 50 * 6 | 50
* 7 | Not used * 7 | Not used
*/ */
static IIO_CONST_ATTR_AVAIL_SAMP_FREQ("0.5 1 2 5 10 20 50"); static IIO_CONST_ATTR_SAMP_FREQ_AVAIL("0.5 1 2 5 10 20 50");
static s32 hmc5843_set_rate(struct i2c_client *client, static s32 hmc5843_set_rate(struct i2c_client *client,
u8 rate) u8 rate)
@ -468,17 +468,17 @@ static IIO_DEVICE_ATTR(magn_range,
set_range, set_range,
HMC5843_CONFIG_REG_B); HMC5843_CONFIG_REG_B);
static ssize_t show_gain(struct device *dev, static ssize_t show_scale(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
char *buf) char *buf)
{ {
struct iio_dev *indio_dev = dev_get_drvdata(dev); struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct hmc5843_data *data = indio_dev->dev_data; struct hmc5843_data *data = indio_dev->dev_data;
return sprintf(buf, "%d\n", regval_to_counts_per_mg[data->range]); return strlen(strcpy(buf, regval_to_scale[data->range]));
} }
static IIO_DEVICE_ATTR(magn_gain, static IIO_DEVICE_ATTR(magn_scale,
S_IRUGO, S_IRUGO,
show_gain, show_scale,
NULL , 0); NULL , 0);
static struct attribute *hmc5843_attributes[] = { static struct attribute *hmc5843_attributes[] = {
@ -486,11 +486,11 @@ static struct attribute *hmc5843_attributes[] = {
&iio_dev_attr_operating_mode.dev_attr.attr, &iio_dev_attr_operating_mode.dev_attr.attr,
&iio_dev_attr_sampling_frequency.dev_attr.attr, &iio_dev_attr_sampling_frequency.dev_attr.attr,
&iio_dev_attr_magn_range.dev_attr.attr, &iio_dev_attr_magn_range.dev_attr.attr,
&iio_dev_attr_magn_gain.dev_attr.attr, &iio_dev_attr_magn_scale.dev_attr.attr,
&iio_dev_attr_magn_x_raw.dev_attr.attr, &iio_dev_attr_magn_x_raw.dev_attr.attr,
&iio_dev_attr_magn_y_raw.dev_attr.attr, &iio_dev_attr_magn_y_raw.dev_attr.attr,
&iio_dev_attr_magn_z_raw.dev_attr.attr, &iio_dev_attr_magn_z_raw.dev_attr.attr,
&iio_const_attr_available_sampling_frequency.dev_attr.attr, &iio_const_attr_sampling_frequency_available.dev_attr.attr,
NULL NULL
}; };