openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

iio: accel: mma9553: comment and error message fixes 

Use "GPIO" instead of "gpio" and "ACPI" instead of "acpi".

Includes a couple of small style fixes in comments
(missing full stop, whitespace, paranthesis).

Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
Suggested-by: Hartmut Knaack <knaack.h@gmx.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Irina Tirdea 2015-04-13 18:40:56 +03:00 committed by Jonathan Cameron
parent 04aff96ad4
commit c105ac6a03
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/iio/accel/mma9553.c
View File

@ -75,14 +75,14 @@
#define MMA9553_DEFAULT_GPIO_PIN mma9551_gpio6 #define MMA9553_DEFAULT_GPIO_PIN mma9551_gpio6
#define MMA9553_DEFAULT_GPIO_POLARITY 0 #define MMA9553_DEFAULT_GPIO_POLARITY 0
/* Bitnum used for gpio configuration = bit number in high status byte */
#define STATUS_TO_BITNUM(bit) (ffs(bit) - 9) #define STATUS_TO_BITNUM(bit) (ffs(bit) - 9)
/* Bitnum used for GPIO configuration = bit number in high status byte */
#define MMA9553_DEFAULT_SAMPLE_RATE 30 /* Hz */ #define MMA9553_DEFAULT_SAMPLE_RATE 30 /* Hz */
/* /*
* The internal activity level must be stable for ACTTHD samples before * The internal activity level must be stable for ACTTHD samples before
* ACTIVITY is updated.The ACTIVITY variable contains the current activity * ACTIVITY is updated. The ACTIVITY variable contains the current activity
* level and is updated every time a step is detected or once a second * level and is updated every time a step is detected or once a second
* if there are no steps. * if there are no steps.
*/ */
@ -401,13 +401,13 @@ static int mma9553_init(struct mma9553_data *data)
sizeof(data->conf), (u16 *) &data->conf); sizeof(data->conf), (u16 *) &data->conf);
if (ret < 0) { if (ret < 0) {
dev_err(&data->client->dev, dev_err(&data->client->dev,
"device is not MMA9553L: failed to read cfg regs\n"); "failed to read configuration registers\n");
return ret; return ret;
} }
/* Reset gpio */
data->gpio_bitnum = -1; data->gpio_bitnum = -1;
/* Reset GPIO */
ret = mma9553_conf_gpio(data); ret = mma9553_conf_gpio(data);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -459,7 +459,8 @@ static int mma9553_read_raw(struct iio_dev *indio_dev,
* The HW only counts steps and other dependent * The HW only counts steps and other dependent
* parameters (speed, distance, calories, activity) * parameters (speed, distance, calories, activity)
* if power is on (from enabling an event or the * if power is on (from enabling an event or the
* step counter */ * step counter).
*/
powered_on = powered_on =
mma9553_is_any_event_enabled(data, false, 0) || mma9553_is_any_event_enabled(data, false, 0) ||
data->stepcnt_enabled; data->stepcnt_enabled;
@ -899,7 +900,7 @@ static int mma9553_get_calibgender_mode(struct iio_dev *indio_dev,
gender = mma9553_get_bits(data->conf.filter, MMA9553_MASK_CONF_MALE); gender = mma9553_get_bits(data->conf.filter, MMA9553_MASK_CONF_MALE);
/* /*
* HW expects 0 for female and 1 for male, * HW expects 0 for female and 1 for male,
* while iio index is 0 for male and 1 for female * while iio index is 0 for male and 1 for female.
*/ */
return !gender; return !gender;
} }
@ -1111,16 +1112,16 @@ static int mma9553_gpio_probe(struct i2c_client *client)
dev = &client->dev; dev = &client->dev;
/* data ready gpio interrupt pin */ /* data ready GPIO interrupt pin */
gpio = devm_gpiod_get_index(dev, MMA9553_GPIO_NAME, 0, GPIOD_IN); gpio = devm_gpiod_get_index(dev, MMA9553_GPIO_NAME, 0, GPIOD_IN);
if (IS_ERR(gpio)) { if (IS_ERR(gpio)) {
dev_err(dev, "acpi gpio get index failed\n"); dev_err(dev, "ACPI GPIO get index failed\n");
return PTR_ERR(gpio); return PTR_ERR(gpio);
} }
ret = gpiod_to_irq(gpio); ret = gpiod_to_irq(gpio);
dev_dbg(dev, "gpio resource, no:%d irq:%d\n", desc_to_gpio(gpio), ret); dev_dbg(dev, "GPIO resource, no:%d irq:%d\n", desc_to_gpio(gpio), ret);
return ret; return ret;
} }