* [PATCH 1/2] iio: as3935: allocate correct iio_device size
@ 2014-10-31 15:44 George McCollister
2014-10-31 15:44 ` [PATCH 2/2] iio: as3935: Remove unnecessary semicolons George McCollister
2014-11-04 21:42 ` [PATCH 1/2] iio: as3935: allocate correct iio_device size Hartmut Knaack
0 siblings, 2 replies; 6+ messages in thread
From: George McCollister @ 2014-10-31 15:44 UTC (permalink / raw)
To: mranostay; +Cc: linux-iio, George McCollister
Signed-off-by: George McCollister <george.mccollister@gmail.com>
---
drivers/iio/proximity/as3935.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/iio/proximity/as3935.c b/drivers/iio/proximity/as3935.c
index 5e780ef..8349cc0 100644
--- a/drivers/iio/proximity/as3935.c
+++ b/drivers/iio/proximity/as3935.c
@@ -330,7 +330,7 @@ static int as3935_probe(struct spi_device *spi)
return -EINVAL;
}
- indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(st));
+ indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
if (!indio_dev)
return -ENOMEM;
--
2.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] iio: as3935: Remove unnecessary semicolons
2014-10-31 15:44 [PATCH 1/2] iio: as3935: allocate correct iio_device size George McCollister
@ 2014-10-31 15:44 ` George McCollister
2014-11-04 21:42 ` Hartmut Knaack
2014-11-04 21:42 ` [PATCH 1/2] iio: as3935: allocate correct iio_device size Hartmut Knaack
1 sibling, 1 reply; 6+ messages in thread
From: George McCollister @ 2014-10-31 15:44 UTC (permalink / raw)
To: mranostay; +Cc: linux-iio, George McCollister
Signed-off-by: George McCollister <george.mccollister@gmail.com>
---
drivers/iio/proximity/as3935.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/iio/proximity/as3935.c b/drivers/iio/proximity/as3935.c
index 8349cc0..466aa43 100644
--- a/drivers/iio/proximity/as3935.c
+++ b/drivers/iio/proximity/as3935.c
@@ -95,7 +95,7 @@ static int as3935_read(struct as3935_state *st, unsigned int reg, int *val)
*val = ret;
return 0;
-};
+}
static int as3935_write(struct as3935_state *st,
unsigned int reg,
@@ -107,7 +107,7 @@ static int as3935_write(struct as3935_state *st,
buf[1] = val;
return spi_write(st->spi, buf, 2);
-};
+}
static ssize_t as3935_sensor_sensitivity_show(struct device *dev,
struct device_attribute *attr,
@@ -122,7 +122,7 @@ static ssize_t as3935_sensor_sensitivity_show(struct device *dev,
val = (val & AS3935_AFE_MASK) >> 1;
return sprintf(buf, "%d\n", val);
-};
+}
static ssize_t as3935_sensor_sensitivity_store(struct device *dev,
struct device_attribute *attr,
@@ -142,7 +142,7 @@ static ssize_t as3935_sensor_sensitivity_store(struct device *dev,
as3935_write(st, AS3935_AFE_GAIN, val << 1);
return len;
-};
+}
static IIO_DEVICE_ATTR(sensor_sensitivity, S_IRUGO | S_IWUSR,
as3935_sensor_sensitivity_show, as3935_sensor_sensitivity_store, 0);
@@ -214,7 +214,7 @@ err_read:
iio_trigger_notify_done(indio_dev->trig);
return IRQ_HANDLED;
-};
+}
static const struct iio_trigger_ops iio_interrupt_trigger_ops = {
.owner = THIS_MODULE,
@@ -238,7 +238,7 @@ static void as3935_event_work(struct work_struct *work)
dev_warn(&st->spi->dev, "noise level is too high");
break;
}
-};
+}
static irqreturn_t as3935_interrupt_handler(int irq, void *private)
{
@@ -417,7 +417,7 @@ unregister_trigger:
iio_trigger_unregister(st->trig);
return ret;
-};
+}
static int as3935_remove(struct spi_device *spi)
{
@@ -429,7 +429,7 @@ static int as3935_remove(struct spi_device *spi)
iio_trigger_unregister(st->trig);
return 0;
-};
+}
static const struct spi_device_id as3935_id[] = {
{"as3935", 0},
--
2.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] iio: as3935: allocate correct iio_device size
2014-10-31 15:44 [PATCH 1/2] iio: as3935: allocate correct iio_device size George McCollister
2014-10-31 15:44 ` [PATCH 2/2] iio: as3935: Remove unnecessary semicolons George McCollister
@ 2014-11-04 21:42 ` Hartmut Knaack
2014-11-05 13:45 ` Jonathan Cameron
1 sibling, 1 reply; 6+ messages in thread
From: Hartmut Knaack @ 2014-11-04 21:42 UTC (permalink / raw)
To: George McCollister, mranostay; +Cc: linux-iio
George McCollister schrieb am 31.10.2014 16:44:
> Signed-off-by: George McCollister <george.mccollister@gmail.com>
Acked-by: Hartmut Knaack <knaack.h@gmx.de>
> ---
> drivers/iio/proximity/as3935.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/iio/proximity/as3935.c b/drivers/iio/proximity/as3935.c
> index 5e780ef..8349cc0 100644
> --- a/drivers/iio/proximity/as3935.c
> +++ b/drivers/iio/proximity/as3935.c
> @@ -330,7 +330,7 @@ static int as3935_probe(struct spi_device *spi)
> return -EINVAL;
> }
>
> - indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(st));
> + indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
> if (!indio_dev)
> return -ENOMEM;
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] iio: as3935: Remove unnecessary semicolons
2014-10-31 15:44 ` [PATCH 2/2] iio: as3935: Remove unnecessary semicolons George McCollister
@ 2014-11-04 21:42 ` Hartmut Knaack
2014-11-05 13:48 ` Jonathan Cameron
0 siblings, 1 reply; 6+ messages in thread
From: Hartmut Knaack @ 2014-11-04 21:42 UTC (permalink / raw)
To: George McCollister, mranostay; +Cc: linux-iio
George McCollister schrieb am 31.10.2014 16:44:
> Signed-off-by: George McCollister <george.mccollister@gmail.com>
Acked-by: Hartmut Knaack <knaack.h@gmx.de>
> ---
> drivers/iio/proximity/as3935.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/iio/proximity/as3935.c b/drivers/iio/proximity/as3935.c
> index 8349cc0..466aa43 100644
> --- a/drivers/iio/proximity/as3935.c
> +++ b/drivers/iio/proximity/as3935.c
> @@ -95,7 +95,7 @@ static int as3935_read(struct as3935_state *st, unsigned int reg, int *val)
> *val = ret;
>
> return 0;
> -};
> +}
>
> static int as3935_write(struct as3935_state *st,
> unsigned int reg,
> @@ -107,7 +107,7 @@ static int as3935_write(struct as3935_state *st,
> buf[1] = val;
>
> return spi_write(st->spi, buf, 2);
> -};
> +}
>
> static ssize_t as3935_sensor_sensitivity_show(struct device *dev,
> struct device_attribute *attr,
> @@ -122,7 +122,7 @@ static ssize_t as3935_sensor_sensitivity_show(struct device *dev,
> val = (val & AS3935_AFE_MASK) >> 1;
>
> return sprintf(buf, "%d\n", val);
> -};
> +}
>
> static ssize_t as3935_sensor_sensitivity_store(struct device *dev,
> struct device_attribute *attr,
> @@ -142,7 +142,7 @@ static ssize_t as3935_sensor_sensitivity_store(struct device *dev,
> as3935_write(st, AS3935_AFE_GAIN, val << 1);
>
> return len;
> -};
> +}
>
> static IIO_DEVICE_ATTR(sensor_sensitivity, S_IRUGO | S_IWUSR,
> as3935_sensor_sensitivity_show, as3935_sensor_sensitivity_store, 0);
> @@ -214,7 +214,7 @@ err_read:
> iio_trigger_notify_done(indio_dev->trig);
>
> return IRQ_HANDLED;
> -};
> +}
>
> static const struct iio_trigger_ops iio_interrupt_trigger_ops = {
> .owner = THIS_MODULE,
> @@ -238,7 +238,7 @@ static void as3935_event_work(struct work_struct *work)
> dev_warn(&st->spi->dev, "noise level is too high");
> break;
> }
> -};
> +}
>
> static irqreturn_t as3935_interrupt_handler(int irq, void *private)
> {
> @@ -417,7 +417,7 @@ unregister_trigger:
> iio_trigger_unregister(st->trig);
>
> return ret;
> -};
> +}
>
> static int as3935_remove(struct spi_device *spi)
> {
> @@ -429,7 +429,7 @@ static int as3935_remove(struct spi_device *spi)
> iio_trigger_unregister(st->trig);
>
> return 0;
> -};
> +}
>
> static const struct spi_device_id as3935_id[] = {
> {"as3935", 0},
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] iio: as3935: allocate correct iio_device size
2014-11-04 21:42 ` [PATCH 1/2] iio: as3935: allocate correct iio_device size Hartmut Knaack
@ 2014-11-05 13:45 ` Jonathan Cameron
0 siblings, 0 replies; 6+ messages in thread
From: Jonathan Cameron @ 2014-11-05 13:45 UTC (permalink / raw)
To: Hartmut Knaack, George McCollister, mranostay; +Cc: linux-iio
On 04/11/14 21:42, Hartmut Knaack wrote:
> George McCollister schrieb am 31.10.2014 16:44:
>> Signed-off-by: George McCollister <george.mccollister@gmail.com>
> Acked-by: Hartmut Knaack <knaack.h@gmx.de>
Applied to the fixes-togreg branch of iio.git and marked for stable.
Thanks,
Jonathan
>> ---
>> drivers/iio/proximity/as3935.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/iio/proximity/as3935.c b/drivers/iio/proximity/as3935.c
>> index 5e780ef..8349cc0 100644
>> --- a/drivers/iio/proximity/as3935.c
>> +++ b/drivers/iio/proximity/as3935.c
>> @@ -330,7 +330,7 @@ static int as3935_probe(struct spi_device *spi)
>> return -EINVAL;
>> }
>>
>> - indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(st));
>> + indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
>> if (!indio_dev)
>> return -ENOMEM;
>>
>>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] iio: as3935: Remove unnecessary semicolons
2014-11-04 21:42 ` Hartmut Knaack
@ 2014-11-05 13:48 ` Jonathan Cameron
0 siblings, 0 replies; 6+ messages in thread
From: Jonathan Cameron @ 2014-11-05 13:48 UTC (permalink / raw)
To: Hartmut Knaack, George McCollister, mranostay; +Cc: linux-iio
On 04/11/14 21:42, Hartmut Knaack wrote:
> George McCollister schrieb am 31.10.2014 16:44:
>> Signed-off-by: George McCollister <george.mccollister@gmail.com>
> Acked-by: Hartmut Knaack <knaack.h@gmx.de>
Applied to the togreg branch of iio.git - initially pushed out as testing
for the autobuilders to play.
Jonathan
>> ---
>> drivers/iio/proximity/as3935.c | 16 ++++++++--------
>> 1 file changed, 8 insertions(+), 8 deletions(-)
>>
>> diff --git a/drivers/iio/proximity/as3935.c b/drivers/iio/proximity/as3935.c
>> index 8349cc0..466aa43 100644
>> --- a/drivers/iio/proximity/as3935.c
>> +++ b/drivers/iio/proximity/as3935.c
>> @@ -95,7 +95,7 @@ static int as3935_read(struct as3935_state *st, unsigned int reg, int *val)
>> *val = ret;
>>
>> return 0;
>> -};
>> +}
>>
>> static int as3935_write(struct as3935_state *st,
>> unsigned int reg,
>> @@ -107,7 +107,7 @@ static int as3935_write(struct as3935_state *st,
>> buf[1] = val;
>>
>> return spi_write(st->spi, buf, 2);
>> -};
>> +}
>>
>> static ssize_t as3935_sensor_sensitivity_show(struct device *dev,
>> struct device_attribute *attr,
>> @@ -122,7 +122,7 @@ static ssize_t as3935_sensor_sensitivity_show(struct device *dev,
>> val = (val & AS3935_AFE_MASK) >> 1;
>>
>> return sprintf(buf, "%d\n", val);
>> -};
>> +}
>>
>> static ssize_t as3935_sensor_sensitivity_store(struct device *dev,
>> struct device_attribute *attr,
>> @@ -142,7 +142,7 @@ static ssize_t as3935_sensor_sensitivity_store(struct device *dev,
>> as3935_write(st, AS3935_AFE_GAIN, val << 1);
>>
>> return len;
>> -};
>> +}
>>
>> static IIO_DEVICE_ATTR(sensor_sensitivity, S_IRUGO | S_IWUSR,
>> as3935_sensor_sensitivity_show, as3935_sensor_sensitivity_store, 0);
>> @@ -214,7 +214,7 @@ err_read:
>> iio_trigger_notify_done(indio_dev->trig);
>>
>> return IRQ_HANDLED;
>> -};
>> +}
>>
>> static const struct iio_trigger_ops iio_interrupt_trigger_ops = {
>> .owner = THIS_MODULE,
>> @@ -238,7 +238,7 @@ static void as3935_event_work(struct work_struct *work)
>> dev_warn(&st->spi->dev, "noise level is too high");
>> break;
>> }
>> -};
>> +}
>>
>> static irqreturn_t as3935_interrupt_handler(int irq, void *private)
>> {
>> @@ -417,7 +417,7 @@ unregister_trigger:
>> iio_trigger_unregister(st->trig);
>>
>> return ret;
>> -};
>> +}
>>
>> static int as3935_remove(struct spi_device *spi)
>> {
>> @@ -429,7 +429,7 @@ static int as3935_remove(struct spi_device *spi)
>> iio_trigger_unregister(st->trig);
>>
>> return 0;
>> -};
>> +}
>>
>> static const struct spi_device_id as3935_id[] = {
>> {"as3935", 0},
>>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-11-05 13:48 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-10-31 15:44 [PATCH 1/2] iio: as3935: allocate correct iio_device size George McCollister
2014-10-31 15:44 ` [PATCH 2/2] iio: as3935: Remove unnecessary semicolons George McCollister
2014-11-04 21:42 ` Hartmut Knaack
2014-11-05 13:48 ` Jonathan Cameron
2014-11-04 21:42 ` [PATCH 1/2] iio: as3935: allocate correct iio_device size Hartmut Knaack
2014-11-05 13:45 ` Jonathan Cameron
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.