Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 205626
b: refs/heads/master
c: c608cb0
h: refs/heads/master
v: v3
  • Loading branch information
Mike Frysinger authored and Greg Kroah-Hartman committed Jun 18, 2010
1 parent ff01a35 commit 37bf85a
Show file tree
Hide file tree
Showing 7 changed files with 41 additions and 30 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 98a62bb7bc55c239c6ecc21e2fdbfa5df7690b30
refs/heads/master: c608cb012e150d5c24b400ea89000105134bd564
19 changes: 12 additions & 7 deletions trunk/drivers/staging/iio/accel/lis3l02dq.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,30 +199,35 @@ int lis3l02dq_initialize_ring(struct iio_ring_buffer *ring);
void lis3l02dq_uninitialize_ring(struct iio_ring_buffer *ring);
#else /* CONFIG_IIO_RING_BUFFER */

static inline void lis3l02dq_remove_trigger(struct iio_dev *indio_dev) {};
static inline void lis3l02dq_remove_trigger(struct iio_dev *indio_dev)
{
}
static inline int lis3l02dq_probe_trigger(struct iio_dev *indio_dev)
{
return 0;
};
}

static inline ssize_t
lis3l02dq_read_accel_from_ring(struct device *dev,
struct device_attribute *attr,
char *buf)
{
return 0;
};
}

static int lis3l02dq_configure_ring(struct iio_dev *indio_dev)
{
return 0;
};
}
static inline void lis3l02dq_unconfigure_ring(struct iio_dev *indio_dev)
{};
{
}
static inline int lis3l02dq_initialize_ring(struct iio_ring_buffer *ring)
{
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_ */
14 changes: 9 additions & 5 deletions trunk/drivers/staging/iio/accel/sca3000.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ static inline int sca3000_11bit_convert(uint8_t msb, uint8_t lsb)
val |= (val & (1 << 12)) ? 0xE000 : 0;

return val;
};
}

static inline int sca3000_13bit_convert(uint8_t msb, uint8_t lsb)
{
Expand All @@ -253,7 +253,7 @@ static inline int sca3000_13bit_convert(uint8_t msb, uint8_t lsb)
val |= (val & (1 << 12)) ? 0xE000 : 0;

return val;
};
}


#ifdef CONFIG_IIO_RING_BUFFER
Expand Down Expand Up @@ -286,15 +286,19 @@ void sca3000_unconfigure_ring(struct iio_dev *indio_dev);
void sca3000_ring_int_process(u8 val, struct iio_ring_buffer *ring);

#else
static inline void sca3000_register_ring_funcs(struct iio_dev *indio_dev) {};
static inline void sca3000_register_ring_funcs(struct iio_dev *indio_dev)
{
}

static inline
int sca3000_register_ring_access_and_init(struct iio_dev *indio_dev)
{
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

14 changes: 7 additions & 7 deletions trunk/drivers/staging/iio/accel/sca3000_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ sca3000_show_available_measurement_modes(struct device *dev,
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");
Expand Down Expand Up @@ -433,7 +433,7 @@ sca3000_show_measurement_mode(struct device *dev,
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) {
Expand All @@ -442,7 +442,7 @@ sca3000_show_measurement_mode(struct device *dev,
break;
}
break;
};
}

error_ret:
mutex_unlock(&st->lock);
Expand Down Expand Up @@ -559,7 +559,7 @@ static ssize_t sca3000_read_av_freq(struct device *dev,
st->info->option_mode_2_freq/2,
st->info->option_mode_2_freq/4);
break;
};
}
kfree(rx);
return len;
error_ret:
Expand Down Expand Up @@ -590,7 +590,7 @@ static inline int __sca3000_get_base_freq(struct sca3000_state *st,
case SCA3000_MEAS_MODE_OP_2:
*base_freq = info->option_mode_2_freq;
break;
};
}
kfree(rx);
error_ret:
return ret;
Expand Down Expand Up @@ -627,8 +627,8 @@ static ssize_t sca3000_read_frequency(struct device *dev,
case 0x02:
len = sprintf(buf, "%d\n", base_freq/4);
break;
};
kfree(rx);
}
kfree(rx);
return len;
error_ret_mut:
mutex_unlock(&st->lock);
Expand Down
14 changes: 8 additions & 6 deletions trunk/drivers/staging/iio/adc/max1363.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ enum max1363_channels {
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 {
Expand Down Expand Up @@ -237,25 +237,27 @@ void max1363_uninitialize_ring(struct iio_ring_buffer *ring);

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_ */
4 changes: 2 additions & 2 deletions trunk/drivers/staging/iio/adc/max1363_core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ const struct max1363_mode
mask))
return &max1363_mode_table[ci->mode_list[i]];
return NULL;
};
}

static ssize_t max1363_show_precision(struct device *dev,
struct device_attribute *attr,
Expand Down Expand Up @@ -935,7 +935,7 @@ static int __devinit max1363_probe(struct i2c_client *client,
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);
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/iio/adc/max1363_ring.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,9 +262,9 @@ void max1363_ring_cleanup(struct iio_dev *indio_dev)
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);
};
}

0 comments on commit 37bf85a

Please sign in to comment.