Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
staging
/
iio
/
magnetometer
/
hmc5843_core.c
diff --git
a/kernel/drivers/staging/iio/magnetometer/hmc5843_core.c
b/kernel/drivers/staging/iio/magnetometer/hmc5843_core.c
index
fffca3a
..
394bc14
100644
(file)
--- a/
kernel/drivers/staging/iio/magnetometer/hmc5843_core.c
+++ b/
kernel/drivers/staging/iio/magnetometer/hmc5843_core.c
@@
-334,7
+334,7
@@
static int hmc5843_get_scale_index(struct hmc5843_data *data, int val, int val2)
{
int i;
{
int i;
- if (val
!= 0
)
+ if (val)
return -EINVAL;
for (i = 0; i < data->variant->n_regval_to_nanoscale; i++)
return -EINVAL;
for (i = 0; i < data->variant->n_regval_to_nanoscale; i++)
@@
-577,7
+577,7
@@
int hmc5843_common_resume(struct device *dev)
EXPORT_SYMBOL(hmc5843_common_resume);
int hmc5843_common_probe(struct device *dev, struct regmap *regmap,
EXPORT_SYMBOL(hmc5843_common_resume);
int hmc5843_common_probe(struct device *dev, struct regmap *regmap,
- enum hmc5843_ids id)
+ enum hmc5843_ids id
, const char *name
)
{
struct hmc5843_data *data;
struct iio_dev *indio_dev;
{
struct hmc5843_data *data;
struct iio_dev *indio_dev;
@@
-597,7
+597,7
@@
int hmc5843_common_probe(struct device *dev, struct regmap *regmap,
mutex_init(&data->lock);
indio_dev->dev.parent = dev;
mutex_init(&data->lock);
indio_dev->dev.parent = dev;
- indio_dev->name =
dev->driver->
name;
+ indio_dev->name = name;
indio_dev->info = &hmc5843_info;
indio_dev->modes = INDIO_DIRECT_MODE;
indio_dev->channels = data->variant->channels;
indio_dev->info = &hmc5843_info;
indio_dev->modes = INDIO_DIRECT_MODE;
indio_dev->channels = data->variant->channels;