proxmox-mirrors/mirror_ubuntu-kernels
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_ubuntu-kernels.git synced 2025-12-08 10:36:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

iio: accel: mma9551_core: use size in words for word buffers

Browse Source 
Change the prototype for the mma9551_read/write_*_words functions
to receive the length of the buffer in words (instead of bytes) since
we are using a word buffer. This will prevent users from sending an
odd number of bytes for a word array.

Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Irina Tirdea 2015-04-13 18:41:01 +03:00 committed by Jonathan Cameron
parent 1ca0259b18
commit c0d901cce7
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/iio/accel/mma9551_core.c
View File

@ -373,7 +373,7 @@ EXPORT_SYMBOL(mma9551_read_status_word);
* @client: I2C client * @client: I2C client
* @app_id: Application ID * @app_id: Application ID
* @reg: Application register * @reg: Application register
* @len: Length of array to read in bytes * @len: Length of array to read (in words)
* @buf: Array of words to read * @buf: Array of words to read
* *
* Read multiple configuration registers (word-sized registers). * Read multiple configuration registers (word-sized registers).
@ -388,20 +388,19 @@ int mma9551_read_config_words(struct i2c_client *client, u8 app_id,
u16 reg, u8 len, u16 *buf) u16 reg, u8 len, u16 *buf)
{ {
int ret, i; int ret, i;
int len_words = len / sizeof(u16);
__be16 be_buf[MMA9551_MAX_MAILBOX_DATA_REGS / 2]; __be16 be_buf[MMA9551_MAX_MAILBOX_DATA_REGS / 2];
if (len_words > ARRAY_SIZE(be_buf)) { if (len > ARRAY_SIZE(be_buf)) {
dev_err(&client->dev, "Invalid buffer size %d\n", len); dev_err(&client->dev, "Invalid buffer size %d\n", len);
return -EINVAL; return -EINVAL;
} }
ret = mma9551_transfer(client, app_id, MMA9551_CMD_READ_CONFIG, ret = mma9551_transfer(client, app_id, MMA9551_CMD_READ_CONFIG,
reg, NULL, 0, (u8 *) be_buf, len); reg, NULL, 0, (u8 *)be_buf, len * sizeof(u16));
if (ret < 0) if (ret < 0)
return ret; return ret;
for (i = 0; i < len_words; i++) for (i = 0; i < len; i++)
buf[i] = be16_to_cpu(be_buf[i]); buf[i] = be16_to_cpu(be_buf[i]);
return 0; return 0;
@ -413,7 +412,7 @@ EXPORT_SYMBOL(mma9551_read_config_words);
* @client: I2C client * @client: I2C client
* @app_id: Application ID * @app_id: Application ID
* @reg: Application register * @reg: Application register
* @len: Length of array to read in bytes * @len: Length of array to read (in words)
* @buf: Array of words to read * @buf: Array of words to read
* *
* Read multiple status registers (word-sized registers). * Read multiple status registers (word-sized registers).
@ -428,20 +427,19 @@ int mma9551_read_status_words(struct i2c_client *client, u8 app_id,
u16 reg, u8 len, u16 *buf) u16 reg, u8 len, u16 *buf)
{ {
int ret, i; int ret, i;
int len_words = len / sizeof(u16);
__be16 be_buf[MMA9551_MAX_MAILBOX_DATA_REGS / 2]; __be16 be_buf[MMA9551_MAX_MAILBOX_DATA_REGS / 2];
if (len_words > ARRAY_SIZE(be_buf)) { if (len > ARRAY_SIZE(be_buf)) {
dev_err(&client->dev, "Invalid buffer size %d\n", len); dev_err(&client->dev, "Invalid buffer size %d\n", len);
return -EINVAL; return -EINVAL;
} }
ret = mma9551_transfer(client, app_id, MMA9551_CMD_READ_STATUS, ret = mma9551_transfer(client, app_id, MMA9551_CMD_READ_STATUS,
reg, NULL, 0, (u8 *) be_buf, len); reg, NULL, 0, (u8 *)be_buf, len * sizeof(u16));
if (ret < 0) if (ret < 0)
return ret; return ret;
for (i = 0; i < len_words; i++) for (i = 0; i < len; i++)
buf[i] = be16_to_cpu(be_buf[i]); buf[i] = be16_to_cpu(be_buf[i]);
return 0; return 0;
@ -453,7 +451,7 @@ EXPORT_SYMBOL(mma9551_read_status_words);
* @client: I2C client * @client: I2C client
* @app_id: Application ID * @app_id: Application ID
* @reg: Application register * @reg: Application register
* @len: Length of array to write in bytes * @len: Length of array to write (in words)
* @buf: Array of words to write * @buf: Array of words to write
* *
* Write multiple configuration registers (word-sized registers). * Write multiple configuration registers (word-sized registers).
@ -468,19 +466,18 @@ int mma9551_write_config_words(struct i2c_client *client, u8 app_id,
u16 reg, u8 len, u16 *buf) u16 reg, u8 len, u16 *buf)
{ {
int i; int i;
int len_words = len / sizeof(u16);
__be16 be_buf[(MMA9551_MAX_MAILBOX_DATA_REGS - 1) / 2]; __be16 be_buf[(MMA9551_MAX_MAILBOX_DATA_REGS - 1) / 2];
if (len_words > ARRAY_SIZE(be_buf)) { if (len > ARRAY_SIZE(be_buf)) {
dev_err(&client->dev, "Invalid buffer size %d\n", len); dev_err(&client->dev, "Invalid buffer size %d\n", len);
return -EINVAL; return -EINVAL;
} }
for (i = 0; i < len_words; i++) for (i = 0; i < len; i++)
be_buf[i] = cpu_to_be16(buf[i]); be_buf[i] = cpu_to_be16(buf[i]);
return mma9551_transfer(client, app_id, MMA9551_CMD_WRITE_CONFIG, return mma9551_transfer(client, app_id, MMA9551_CMD_WRITE_CONFIG,
reg, (u8 *) be_buf, len, NULL, 0); reg, (u8 *)be_buf, len * sizeof(u16), NULL, 0);
} }
EXPORT_SYMBOL(mma9551_write_config_words); EXPORT_SYMBOL(mma9551_write_config_words);

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

@ -322,7 +322,8 @@ static int mma9553_read_activity_stepcnt(struct mma9553_data *data,
int ret; int ret;
ret = mma9551_read_status_words(data->client, MMA9551_APPID_PEDOMETER, ret = mma9551_read_status_words(data->client, MMA9551_APPID_PEDOMETER,
MMA9553_REG_STATUS, sizeof(u32), buf); MMA9553_REG_STATUS, ARRAY_SIZE(buf),
buf);
if (ret < 0) { if (ret < 0) {
dev_err(&data->client->dev, dev_err(&data->client->dev,
"error reading status and stepcnt\n"); "error reading status and stepcnt\n");
@ -397,7 +398,8 @@ static int mma9553_init(struct mma9553_data *data)
ret = ret =
mma9551_read_config_words(data->client, MMA9551_APPID_PEDOMETER, mma9551_read_config_words(data->client, MMA9551_APPID_PEDOMETER,
MMA9553_REG_CONF_SLEEPMIN, MMA9553_REG_CONF_SLEEPMIN,
sizeof(data->conf), (u16 *) &data->conf); sizeof(data->conf) / sizeof(u16),
(u16 *)&data->conf);
if (ret < 0) { if (ret < 0) {
dev_err(&data->client->dev, dev_err(&data->client->dev,
"failed to read configuration registers\n"); "failed to read configuration registers\n");
@ -430,7 +432,8 @@ static int mma9553_init(struct mma9553_data *data)
ret = ret =
mma9551_write_config_words(data->client, MMA9551_APPID_PEDOMETER, mma9551_write_config_words(data->client, MMA9551_APPID_PEDOMETER,
MMA9553_REG_CONF_SLEEPMIN, MMA9553_REG_CONF_SLEEPMIN,
sizeof(data->conf), (u16 *) &data->conf); sizeof(data->conf) / sizeof(u16),
(u16 *)&data->conf);
if (ret < 0) { if (ret < 0) {
dev_err(&data->client->dev, dev_err(&data->client->dev,
"failed to write configuration registers\n"); "failed to write configuration registers\n");