Diff
Modified: trunk/drivers/staging/iio/accel/lis3l02dq.h (8829 => 8830)
--- trunk/drivers/staging/iio/accel/lis3l02dq.h 2010-05-23 06:42:28 UTC (rev 8829)
+++ trunk/drivers/staging/iio/accel/lis3l02dq.h 2010-05-23 07:00:09 UTC (rev 8830)
@@ -226,6 +226,8 @@
{
return 0;
}
-static inline void lis3l02dq_uninitialize_ring(struct iio_ring_buffer *ring) {};
+static inline void lis3l02dq_uninitialize_ring(struct iio_ring_buffer *ring)
+{
+}
#endif /* CONFIG_IIO_RING_BUFFER */
#endif /* SPI_LIS3L02DQ_H_ */
Modified: trunk/drivers/staging/iio/accel/sca3000.h (8829 => 8830)
--- trunk/drivers/staging/iio/accel/sca3000.h 2010-05-23 06:42:28 UTC (rev 8829)
+++ trunk/drivers/staging/iio/accel/sca3000.h 2010-05-23 07:00:09 UTC (rev 8830)
@@ -296,7 +296,9 @@
return 0;
}
-static inline void sca3000_ring_int_process(u8 val, void *ring) {};
+static inline void sca3000_ring_int_process(u8 val, void *ring)
+{
+}
#endif
Modified: trunk/drivers/staging/iio/accel/sca3000_core.c (8829 => 8830)
--- trunk/drivers/staging/iio/accel/sca3000_core.c 2010-05-23 06:42:28 UTC (rev 8829)
+++ trunk/drivers/staging/iio/accel/sca3000_core.c 2010-05-23 07:00:09 UTC (rev 8830)
@@ -387,7 +387,7 @@
case SCA3000_OP_MODE_BYPASS:
len += sprintf(buf + len, ", 1 - bypass mode");
break;
- };
+ }
switch (st->info->option_mode_2) {
case SCA3000_OP_MODE_WIDE:
len += sprintf(buf + len, ", 2 - wide mode");
@@ -433,7 +433,7 @@
case SCA3000_OP_MODE_BYPASS:
len += sprintf(buf + len, "1 - bypass mode\n");
break;
- };
+ }
break;
case SCA3000_MEAS_MODE_OP_2:
switch (st->info->option_mode_2) {
@@ -442,7 +442,7 @@
break;
}
break;
- };
+ }
error_ret:
mutex_unlock(&st->lock);
@@ -559,7 +559,7 @@
st->info->option_mode_2_freq/2,
st->info->option_mode_2_freq/4);
break;
- };
+ }
kfree(rx);
return len;
error_ret:
@@ -590,7 +590,7 @@
case SCA3000_MEAS_MODE_OP_2:
*base_freq = info->option_mode_2_freq;
break;
- };
+ }
kfree(rx);
error_ret:
return ret;
@@ -627,8 +627,8 @@
case 0x02:
len = sprintf(buf, "%d\n", base_freq/4);
break;
- };
- kfree(rx);
+ }
+ kfree(rx);
return len;
error_ret_mut:
mutex_unlock(&st->lock);
Modified: trunk/drivers/staging/iio/adc/max1363.h (8829 => 8830)
--- trunk/drivers/staging/iio/adc/max1363.h 2010-05-23 06:42:28 UTC (rev 8829)
+++ trunk/drivers/staging/iio/adc/max1363.h 2010-05-23 07:00:09 UTC (rev 8830)
@@ -147,7 +147,7 @@
max1363_in1min0, max1363_in3min2,
max1363_in5min4, max1363_in7min6,
max1363_in9min8, max1363_in11min10,
- };
+};
/* This must be maintained along side the max1363_mode_table in max1363_core */
enum max1363_modes {
@@ -237,25 +237,27 @@
static inline void max1363_uninitialize_ring(struct iio_ring_buffer *ring)
{
-};
+}
static inline int max1363_initialize_ring(struct iio_ring_buffer *ring)
{
return 0;
-};
+}
int max1363_single_channel_from_ring(long mask, struct max1363_state *st)
{
return -EINVAL;
-};
+}
static inline int
max1363_register_ring_funcs_and_init(struct iio_dev *indio_dev)
{
return 0;
-};
+}
-static inline void max1363_ring_cleanup(struct iio_dev *indio_dev) {};
+static inline void max1363_ring_cleanup(struct iio_dev *indio_dev)
+{
+}
#endif /* CONFIG_MAX1363_RING_BUFFER */
#endif /* _MAX1363_H_ */
Modified: trunk/drivers/staging/iio/adc/max1363_core.c (8829 => 8830)
--- trunk/drivers/staging/iio/adc/max1363_core.c 2010-05-23 06:42:28 UTC (rev 8829)
+++ trunk/drivers/staging/iio/adc/max1363_core.c 2010-05-23 07:00:09 UTC (rev 8830)
@@ -148,7 +148,7 @@
mask))
return &max1363_mode_table[ci->mode_list[i]];
return NULL;
-};
+}
static ssize_t max1363_show_precision(struct device *dev,
struct device_attribute *attr,
@@ -935,7 +935,7 @@
if (!strcmp(max1363_chip_info_tbl[i].name, id->name)) {
st->chip_info = &max1363_chip_info_tbl[i];
break;
- };
+ }
/* Unsupported chip */
if (!st->chip_info) {
dev_err(&client->dev, "%s is not supported\n", id->name);
Modified: trunk/drivers/staging/iio/adc/max1363_ring.c (8829 => 8830)
--- trunk/drivers/staging/iio/adc/max1363_ring.c 2010-05-23 06:42:28 UTC (rev 8829)
+++ trunk/drivers/staging/iio/adc/max1363_ring.c 2010-05-23 07:00:09 UTC (rev 8830)
@@ -262,9 +262,9 @@
void max1363_uninitialize_ring(struct iio_ring_buffer *ring)
{
iio_ring_buffer_unregister(ring);
-};
+}
int max1363_initialize_ring(struct iio_ring_buffer *ring)
{
return iio_ring_buffer_register(ring, 0);
-};
+}
