mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-06 08:46:46 +00:00
Code Issues Releases Wiki Activity

staging: iio: Use kasprintf to allocate and fill trig->name

Browse source 
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Jonathan Cameron 2010-07-11 16:39:08 +01:00 committed by Greg Kroah-Hartman
parent cb46f472cb
commit 3c9bbf58b2
11 changed files with 30 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/staging/iio/accel/adis16209_trigger.c
View file

@ -83,14 +83,13 @@ int adis16209_probe_trigger(struct iio_dev *indio_dev)
struct adis16209_state *st = indio_dev->dev_data;
st->trig = iio_allocate_trigger();
st->trig->name = kmalloc(IIO_TRIGGER_NAME_LENGTH, GFP_KERNEL);
st->trig->name = kasprintf(GFP_KERNEL,
"adis16209-dev%d",
indio_dev->id);
if (!st->trig->name) {
ret = -ENOMEM;
goto error_free_trig;
}
snprintf((char *)st->trig->name,
IIO_TRIGGER_NAME_LENGTH,
"adis16209-dev%d", indio_dev->id);
st->trig->dev.parent = &st->us->dev;
st->trig->owner = THIS_MODULE;
st->trig->private_data = st;

7
drivers/staging/iio/accel/adis16240_trigger.c
View file

@ -83,14 +83,13 @@ int adis16240_probe_trigger(struct iio_dev *indio_dev)
struct adis16240_state *st = indio_dev->dev_data;
st->trig = iio_allocate_trigger();
st->trig->name = kmalloc(IIO_TRIGGER_NAME_LENGTH, GFP_KERNEL);
st->trig->name = kasprintf(GFP_KERNEL,
"adis16240-dev%d",
indio_dev->id);
if (!st->trig->name) {
ret = -ENOMEM;
goto error_free_trig;
}
snprintf((char *)st->trig->name,
IIO_TRIGGER_NAME_LENGTH,
"adis16240-dev%d", indio_dev->id);
st->trig->dev.parent = &st->us->dev;
st->trig->owner = THIS_MODULE;
st->trig->private_data = st;

8
drivers/staging/iio/accel/lis3l02dq_ring.c
View file

@ -495,14 +495,14 @@ int lis3l02dq_probe_trigger(struct iio_dev *indio_dev)
if (!state->trig)
return -ENOMEM;
state->trig->name = kmalloc(IIO_TRIGGER_NAME_LENGTH, GFP_KERNEL);
state->trig->name = kasprintf(GFP_KERNEL,
"lis3l02dq-dev%d",
indio_dev->id);
if (!state->trig->name) {
ret = -ENOMEM;
goto error_free_trig;
}
snprintf((char *)state->trig->name,
IIO_TRIGGER_NAME_LENGTH,
"lis3l02dq-dev%d", indio_dev->id);
state->trig->dev.parent = &state->us->dev;
state->trig->owner = THIS_MODULE;
state->trig->private_data = state;

7
drivers/staging/iio/gyro/adis16260_trigger.c
View file

@ -83,14 +83,13 @@ int adis16260_probe_trigger(struct iio_dev *indio_dev)
struct adis16260_state *st = indio_dev->dev_data;
st->trig = iio_allocate_trigger();
st->trig->name = kmalloc(IIO_TRIGGER_NAME_LENGTH, GFP_KERNEL);
st->trig->name = kasprintf(GFP_KERNEL,
"adis16260-dev%d",
indio_dev->id);
if (!st->trig->name) {
ret = -ENOMEM;
goto error_free_trig;
}
snprintf((char *)st->trig->name,
IIO_TRIGGER_NAME_LENGTH,
"adis16260-dev%d", indio_dev->id);
st->trig->dev.parent = &st->us->dev;
st->trig->owner = THIS_MODULE;
st->trig->private_data = st;

7
drivers/staging/iio/imu/adis16300_trigger.c
View file

@ -86,14 +86,13 @@ int adis16300_probe_trigger(struct iio_dev *indio_dev)
struct adis16300_state *st = indio_dev->dev_data;
st->trig = iio_allocate_trigger();
st->trig->name = kmalloc(IIO_TRIGGER_NAME_LENGTH, GFP_KERNEL);
st->trig->name = kasprintf(GFP_KERNEL,
"adis16300-dev%d",
indio_dev->id);
if (!st->trig->name) {
ret = -ENOMEM;
goto error_free_trig;
}
snprintf((char *)st->trig->name,
IIO_TRIGGER_NAME_LENGTH,
"adis16300-dev%d", indio_dev->id);
st->trig->dev.parent = &st->us->dev;
st->trig->owner = THIS_MODULE;
st->trig->private_data = st;

7
drivers/staging/iio/imu/adis16350_trigger.c
View file

@ -86,14 +86,13 @@ int adis16350_probe_trigger(struct iio_dev *indio_dev)
struct adis16350_state *st = indio_dev->dev_data;
st->trig = iio_allocate_trigger();
st->trig->name = kmalloc(IIO_TRIGGER_NAME_LENGTH, GFP_KERNEL);
st->trig->name = kasprintf(GFP_KERNEL,
"adis16350-dev%d",
indio_dev->id);
if (!st->trig->name) {
ret = -ENOMEM;
goto error_free_trig;
}
snprintf((char *)st->trig->name,
IIO_TRIGGER_NAME_LENGTH,
"adis16350-dev%d", indio_dev->id);
st->trig->dev.parent = &st->us->dev;
st->trig->owner = THIS_MODULE;
st->trig->private_data = st;

7
drivers/staging/iio/imu/adis16400_trigger.c
View file

@ -86,14 +86,13 @@ int adis16400_probe_trigger(struct iio_dev *indio_dev)
struct adis16400_state *st = indio_dev->dev_data;
st->trig = iio_allocate_trigger();
st->trig->name = kmalloc(IIO_TRIGGER_NAME_LENGTH, GFP_KERNEL);
st->trig->name = kasprintf(GFP_KERNEL,
"adis16400-dev%d",
indio_dev->id);
if (!st->trig->name) {
ret = -ENOMEM;
goto error_free_trig;
}
snprintf((char *)st->trig->name,
IIO_TRIGGER_NAME_LENGTH,
"adis16400-dev%d", indio_dev->id);
st->trig->dev.parent = &st->us->dev;
st->trig->owner = THIS_MODULE;
st->trig->private_data = st;

9
drivers/staging/iio/industrialio-trigger.c
View file

@ -295,10 +295,9 @@ static ssize_t iio_trigger_read_current(struct device *dev,
struct iio_dev *dev_info = dev_get_drvdata(dev);
int len = 0;
if (dev_info->trig)
len = snprintf(buf,
IIO_TRIGGER_NAME_LENGTH,
"%s\n",
dev_info->trig->name);
len = sprintf(buf,
"%s\n",
dev_info->trig->name);
return len;
}
@ -323,8 +322,6 @@ static ssize_t iio_trigger_write_current(struct device *dev,
}
mutex_unlock(&dev_info->mlock);
len = len < IIO_TRIGGER_NAME_LENGTH ? len : IIO_TRIGGER_NAME_LENGTH;
dev_info->trig = iio_trigger_find_by_name(buf, len);
if (oldtrig && dev_info->trig != oldtrig)
iio_put_trigger(oldtrig);

4
drivers/staging/iio/trigger.h
View file

@ -8,10 +8,6 @@
*/
#ifndef _IIO_TRIGGER_H_
#define _IIO_TRIGGER_H_
#define IIO_TRIGGER_NAME_LENGTH 20
#define IIO_TRIGGER_ID_PREFIX "iio:trigger"
#define IIO_TRIGGER_ID_FORMAT IIO_TRIGGER_ID_PREFIX "%d"
/**
* struct iio_trigger - industrial I/O trigger device

9
drivers/staging/iio/trigger/iio-trig-gpio.c
View file

@ -93,16 +93,11 @@ static int iio_gpio_trigger_probe(struct platform_device *pdev)
trig->private_data = trig_info;
trig_info->irq = irq;
trig->owner = THIS_MODULE;
trig->name = kmalloc(IIO_TRIGGER_NAME_LENGTH,
GFP_KERNEL);
if (!trig->name) {
trig->name = kasprintf(GFP_KERNEL, "irqtrig%d", irq);
if (trig->name == NULL) {
ret = -ENOMEM;
goto error_free_trig_info;
}
snprintf((char *)trig->name,
IIO_TRIGGER_NAME_LENGTH,
"irqtrig%d", irq);
ret = request_irq(irq, iio_gpio_trigger_poll,
irqflags, trig->name, trig);
if (ret) {

12
drivers/staging/iio/trigger/iio-trig-periodic-rtc.c
View file

@ -25,7 +25,6 @@ static DEFINE_MUTEX(iio_prtc_trigger_list_lock);
struct iio_prtc_trigger_info {
struct rtc_device *rtc;
int frequency;
char *name;
struct rtc_task task;
};
@ -78,8 +77,7 @@ static ssize_t iio_trig_periodic_read_name(struct device *dev,
char *buf)
{
struct iio_trigger *trig = dev_get_drvdata(dev);
struct iio_prtc_trigger_info *trig_info = trig->private_data;
return sprintf(buf, "%s\n", trig_info->name);
return sprintf(buf, "%s\n", trig->name);
}
static DEVICE_ATTR(name, S_IRUGO,
@ -129,16 +127,12 @@ static int iio_trig_periodic_rtc_probe(struct platform_device *dev)
trig->private_data = trig_info;
trig->owner = THIS_MODULE;
trig->set_trigger_state = &iio_trig_periodic_rtc_set_state;
trig->name = kmalloc(IIO_TRIGGER_NAME_LENGTH, GFP_KERNEL);
trig->name = kasprintf(GFP_KERNEL, "periodic%s", pdata[i]);
if (trig->name == NULL) {
ret = -ENOMEM;
goto error_free_trig_info;
}
snprintf((char *)trig->name,
IIO_TRIGGER_NAME_LENGTH,
"periodic%s",
pdata[i]);
trig_info->name = (char *)trig->name;
/* RTC access */
trig_info->rtc
= rtc_class_open(pdata[i]);