* [PATCH 0/5] Fix iio/magnetometer style warnings
@ 2015-03-19 19:03 Cristina Opriceana
2015-03-19 19:04 ` [PATCH 1/5] Staging: iio: Simplify NULL pointer condition Cristina Opriceana
` (4 more replies)
0 siblings, 5 replies; 7+ messages in thread
From: Cristina Opriceana @ 2015-03-19 19:03 UTC (permalink / raw)
To: outreachy-kernel
This patchset fixes some iio/magnetometer style warnings in order to
keep the code clean.
Cristina Opriceana (5):
Staging: iio: Simplify NULL pointer condition
Staging: iio: Align function parameters to match first row
Staging: iio: Remove multiple blank lines
Staging: iio: Remove line over 80 characters
Staging: iio: Add kernel-doc for struct hmc5843
drivers/staging/iio/magnetometer/hmc5843.h | 13 ++++--
drivers/staging/iio/magnetometer/hmc5843_core.c | 59 ++++++++++++++-----------
drivers/staging/iio/magnetometer/hmc5843_i2c.c | 8 ++--
3 files changed, 46 insertions(+), 34 deletions(-)
--
1.9.1
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 1/5] Staging: iio: Simplify NULL pointer condition 2015-03-19 19:03 [PATCH 0/5] Fix iio/magnetometer style warnings Cristina Opriceana @ 2015-03-19 19:04 ` Cristina Opriceana 2015-03-19 19:06 ` [PATCH 2/5] Staging: iio: Align function parameters to match first row Cristina Opriceana ` (3 subsequent siblings) 4 siblings, 0 replies; 7+ messages in thread From: Cristina Opriceana @ 2015-03-19 19:04 UTC (permalink / raw) To: outreachy-kernel; +Cc: outreachy-kernel Replace NULL comparrison with its shorter form. Done with coccinelle: @replace_rule@ expression e; @@ -e == NULL + !e Signed-off-by: Cristina Opriceana <cristina.opriceana@gmail.com> --- drivers/staging/iio/magnetometer/hmc5843_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/iio/magnetometer/hmc5843_core.c b/drivers/staging/iio/magnetometer/hmc5843_core.c index d03833b..20c693e 100644 --- a/drivers/staging/iio/magnetometer/hmc5843_core.c +++ b/drivers/staging/iio/magnetometer/hmc5843_core.c @@ -579,7 +579,7 @@ int hmc5843_common_probe(struct device *dev, struct regmap *regmap, int ret; indio_dev = devm_iio_device_alloc(dev, sizeof(*data)); - if (indio_dev == NULL) + if (!indio_dev) return -ENOMEM; dev_set_drvdata(dev, indio_dev); -- 1.9.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/5] Staging: iio: Align function parameters to match first row 2015-03-19 19:03 [PATCH 0/5] Fix iio/magnetometer style warnings Cristina Opriceana 2015-03-19 19:04 ` [PATCH 1/5] Staging: iio: Simplify NULL pointer condition Cristina Opriceana @ 2015-03-19 19:06 ` Cristina Opriceana 2015-03-19 19:07 ` [PATCH 3/5] Staging: iio: Remove multiple blank lines Cristina Opriceana ` (2 subsequent siblings) 4 siblings, 0 replies; 7+ messages in thread From: Cristina Opriceana @ 2015-03-19 19:06 UTC (permalink / raw) To: outreachy-kernel This patch improves coding style by aligning parameters in iio/magnetometer function calls, to remove the following warning: "CHECK: Alignment should match open parenthesis". Signed-off-by: Cristina Opriceana <cristina.opriceana@gmail.com> --- drivers/staging/iio/magnetometer/hmc5843.h | 2 +- drivers/staging/iio/magnetometer/hmc5843_core.c | 56 ++++++++++++++----------- drivers/staging/iio/magnetometer/hmc5843_i2c.c | 2 +- 3 files changed, 33 insertions(+), 27 deletions(-) diff --git a/drivers/staging/iio/magnetometer/hmc5843.h b/drivers/staging/iio/magnetometer/hmc5843.h index b784e3e..879d43b 100644 --- a/drivers/staging/iio/magnetometer/hmc5843.h +++ b/drivers/staging/iio/magnetometer/hmc5843.h @@ -41,7 +41,7 @@ struct hmc5843_data { }; int hmc5843_common_probe(struct device *dev, struct regmap *regmap, - enum hmc5843_ids id); + enum hmc5843_ids id); int hmc5843_common_remove(struct device *dev); int hmc5843_common_suspend(struct device *dev); diff --git a/drivers/staging/iio/magnetometer/hmc5843_core.c b/drivers/staging/iio/magnetometer/hmc5843_core.c index 20c693e..9c4ac0a 100644 --- a/drivers/staging/iio/magnetometer/hmc5843_core.c +++ b/drivers/staging/iio/magnetometer/hmc5843_core.c @@ -122,7 +122,7 @@ static s32 hmc5843_set_mode(struct hmc5843_data *data, u8 operating_mode) mutex_lock(&data->lock); ret = regmap_update_bits(data->regmap, HMC5843_MODE_REG, - HMC5843_MODE_MASK, operating_mode); + HMC5843_MODE_MASK, operating_mode); mutex_unlock(&data->lock); return ret; @@ -165,7 +165,7 @@ static int hmc5843_read_measurement(struct hmc5843_data *data, return ret; } ret = regmap_bulk_read(data->regmap, HMC5843_DATA_OUT_MSB_REGS, - values, sizeof(values)); + values, sizeof(values)); mutex_unlock(&data->lock); if (ret < 0) return ret; @@ -198,15 +198,16 @@ static int hmc5843_set_meas_conf(struct hmc5843_data *data, u8 meas_conf) mutex_lock(&data->lock); ret = regmap_update_bits(data->regmap, HMC5843_CONFIG_REG_A, - HMC5843_MEAS_CONF_MASK, meas_conf); + HMC5843_MEAS_CONF_MASK, meas_conf); mutex_unlock(&data->lock); return ret; } -static ssize_t hmc5843_show_measurement_configuration(struct device *dev, - struct device_attribute *attr, - char *buf) +static +ssize_t hmc5843_show_measurement_configuration(struct device *dev, + struct device_attribute *attr, + char *buf) { struct hmc5843_data *data = iio_priv(dev_to_iio_dev(dev)); unsigned int val; @@ -220,10 +221,11 @@ static ssize_t hmc5843_show_measurement_configuration(struct device *dev, return sprintf(buf, "%d\n", val); } -static ssize_t hmc5843_set_measurement_configuration(struct device *dev, - struct device_attribute *attr, - const char *buf, - size_t count) +static +ssize_t hmc5843_set_measurement_configuration(struct device *dev, + struct device_attribute *attr, + const char *buf, + size_t count) { struct hmc5843_data *data = iio_priv(dev_to_iio_dev(dev)); unsigned long meas_conf = 0; @@ -246,8 +248,9 @@ static IIO_DEVICE_ATTR(meas_conf, hmc5843_set_measurement_configuration, 0); -static ssize_t hmc5843_show_samp_freq_avail(struct device *dev, - struct device_attribute *attr, char *buf) +static +ssize_t hmc5843_show_samp_freq_avail(struct device *dev, + struct device_attribute *attr, char *buf) { struct hmc5843_data *data = iio_priv(dev_to_iio_dev(dev)); size_t len = 0; @@ -272,20 +275,21 @@ static int hmc5843_set_samp_freq(struct hmc5843_data *data, u8 rate) mutex_lock(&data->lock); ret = regmap_update_bits(data->regmap, HMC5843_CONFIG_REG_A, - HMC5843_RATE_MASK, rate << HMC5843_RATE_OFFSET); + HMC5843_RATE_MASK, + rate << HMC5843_RATE_OFFSET); mutex_unlock(&data->lock); return ret; } static int hmc5843_get_samp_freq_index(struct hmc5843_data *data, - int val, int val2) + int val, int val2) { int i; for (i = 0; i < data->variant->n_regval_to_samp_freq; i++) if (val == data->variant->regval_to_samp_freq[i][0] && - val2 == data->variant->regval_to_samp_freq[i][1]) + val2 == data->variant->regval_to_samp_freq[i][1]) return i; return -EINVAL; @@ -297,15 +301,16 @@ static int hmc5843_set_range_gain(struct hmc5843_data *data, u8 range) mutex_lock(&data->lock); ret = regmap_update_bits(data->regmap, HMC5843_CONFIG_REG_B, - HMC5843_RANGE_GAIN_MASK, - range << HMC5843_RANGE_GAIN_OFFSET); + HMC5843_RANGE_GAIN_MASK, + range << HMC5843_RANGE_GAIN_OFFSET); mutex_unlock(&data->lock); return ret; } static ssize_t hmc5843_show_scale_avail(struct device *dev, - struct device_attribute *attr, char *buf) + struct device_attribute *attr, + char *buf) { struct hmc5843_data *data = iio_priv(dev_to_iio_dev(dev)); @@ -396,7 +401,8 @@ static int hmc5843_write_raw(struct iio_dev *indio_dev, } static int hmc5843_write_raw_get_fmt(struct iio_dev *indio_dev, - struct iio_chan_spec const *chan, long mask) + struct iio_chan_spec const *chan, + long mask) { switch (mask) { case IIO_CHAN_INFO_SAMP_FREQ: @@ -423,14 +429,14 @@ static irqreturn_t hmc5843_trigger_handler(int irq, void *p) } ret = regmap_bulk_read(data->regmap, HMC5843_DATA_OUT_MSB_REGS, - data->buffer, 3 * sizeof(__be16)); + data->buffer, 3 * sizeof(__be16)); mutex_unlock(&data->lock); if (ret < 0) goto done; iio_push_to_buffers_with_timestamp(indio_dev, data->buffer, - iio_get_time_ns()); + iio_get_time_ns()); done: iio_trigger_notify_done(indio_dev->trig); @@ -526,7 +532,7 @@ static int hmc5843_init(struct hmc5843_data *data) u8 id[3]; ret = regmap_bulk_read(data->regmap, HMC5843_ID_REG, - id, ARRAY_SIZE(id)); + id, ARRAY_SIZE(id)); if (ret < 0) return ret; if (id[0] != 'H' || id[1] != '4' || id[2] != '3') { @@ -567,12 +573,12 @@ EXPORT_SYMBOL(hmc5843_common_suspend); int hmc5843_common_resume(struct device *dev) { return hmc5843_set_mode(iio_priv(dev_get_drvdata(dev)), - HMC5843_MODE_SLEEP); + HMC5843_MODE_SLEEP); } EXPORT_SYMBOL(hmc5843_common_resume); int hmc5843_common_probe(struct device *dev, struct regmap *regmap, - enum hmc5843_ids id) + enum hmc5843_ids id) { struct hmc5843_data *data; struct iio_dev *indio_dev; @@ -604,7 +610,7 @@ int hmc5843_common_probe(struct device *dev, struct regmap *regmap, return ret; ret = iio_triggered_buffer_setup(indio_dev, NULL, - hmc5843_trigger_handler, NULL); + hmc5843_trigger_handler, NULL); if (ret < 0) goto sleep_mode; diff --git a/drivers/staging/iio/magnetometer/hmc5843_i2c.c b/drivers/staging/iio/magnetometer/hmc5843_i2c.c index 6acd614..8d090b4 100644 --- a/drivers/staging/iio/magnetometer/hmc5843_i2c.c +++ b/drivers/staging/iio/magnetometer/hmc5843_i2c.c @@ -57,7 +57,7 @@ static struct regmap_config hmc5843_i2c_regmap_config = { }; static int hmc5843_i2c_probe(struct i2c_client *client, - const struct i2c_device_id *id) + const struct i2c_device_id *id) { return hmc5843_common_probe(&client->dev, devm_regmap_init_i2c(client, &hmc5843_i2c_regmap_config), -- 1.9.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/5] Staging: iio: Remove multiple blank lines 2015-03-19 19:03 [PATCH 0/5] Fix iio/magnetometer style warnings Cristina Opriceana 2015-03-19 19:04 ` [PATCH 1/5] Staging: iio: Simplify NULL pointer condition Cristina Opriceana 2015-03-19 19:06 ` [PATCH 2/5] Staging: iio: Align function parameters to match first row Cristina Opriceana @ 2015-03-19 19:07 ` Cristina Opriceana 2015-03-19 19:07 ` [PATCH 4/5] Staging: iio: Remove line over 80 characters Cristina Opriceana 2015-03-19 19:10 ` [PATCH 5/5] Staging: iio: Add kernel-doc for struct hmc5843 Cristina Opriceana 4 siblings, 0 replies; 7+ messages in thread From: Cristina Opriceana @ 2015-03-19 19:07 UTC (permalink / raw) To: outreachy-kernel; +Cc: outreachy-kernel This patch removes blank uneeded lines in order to remove the folowing checkpatch.pl warning: "Please don't use multiple blank lines". Signed-off-by: Cristina Opriceana <cristina.opriceana@gmail.com> --- drivers/staging/iio/magnetometer/hmc5843.h | 1 - drivers/staging/iio/magnetometer/hmc5843_core.c | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/staging/iio/magnetometer/hmc5843.h b/drivers/staging/iio/magnetometer/hmc5843.h index 879d43b..332a75c 100644 --- a/drivers/staging/iio/magnetometer/hmc5843.h +++ b/drivers/staging/iio/magnetometer/hmc5843.h @@ -10,7 +10,6 @@ * * */ - #ifndef HMC5843_CORE_H #define HMC5843_CORE_H diff --git a/drivers/staging/iio/magnetometer/hmc5843_core.c b/drivers/staging/iio/magnetometer/hmc5843_core.c index 9c4ac0a..cdbf369 100644 --- a/drivers/staging/iio/magnetometer/hmc5843_core.c +++ b/drivers/staging/iio/magnetometer/hmc5843_core.c @@ -562,7 +562,6 @@ static const struct iio_info hmc5843_info = { static const unsigned long hmc5843_scan_masks[] = {0x7, 0}; - int hmc5843_common_suspend(struct device *dev) { return hmc5843_set_mode(iio_priv(dev_get_drvdata(dev)), -- 1.9.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 4/5] Staging: iio: Remove line over 80 characters 2015-03-19 19:03 [PATCH 0/5] Fix iio/magnetometer style warnings Cristina Opriceana ` (2 preceding siblings ...) 2015-03-19 19:07 ` [PATCH 3/5] Staging: iio: Remove multiple blank lines Cristina Opriceana @ 2015-03-19 19:07 ` Cristina Opriceana 2015-03-19 19:10 ` [PATCH 5/5] Staging: iio: Add kernel-doc for struct hmc5843 Cristina Opriceana 4 siblings, 0 replies; 7+ messages in thread From: Cristina Opriceana @ 2015-03-19 19:07 UTC (permalink / raw) To: outreachy-kernel; +Cc: outreachy-kernel Rename variable in order to fix the 80 characters per line warning. Found by checkpatch.pl Signed-off-by: Cristina Opriceana <cristina.opriceana@gmail.com> --- drivers/staging/iio/magnetometer/hmc5843_i2c.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/iio/magnetometer/hmc5843_i2c.c b/drivers/staging/iio/magnetometer/hmc5843_i2c.c index 8d090b4..6b4c742 100644 --- a/drivers/staging/iio/magnetometer/hmc5843_i2c.c +++ b/drivers/staging/iio/magnetometer/hmc5843_i2c.c @@ -56,11 +56,11 @@ static struct regmap_config hmc5843_i2c_regmap_config = { .cache_type = REGCACHE_RBTREE, }; -static int hmc5843_i2c_probe(struct i2c_client *client, +static int hmc5843_i2c_probe(struct i2c_client *cli, const struct i2c_device_id *id) { - return hmc5843_common_probe(&client->dev, - devm_regmap_init_i2c(client, &hmc5843_i2c_regmap_config), + return hmc5843_common_probe(&cli->dev, + devm_regmap_init_i2c(cli, &hmc5843_i2c_regmap_config), id->driver_data); } -- 1.9.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 5/5] Staging: iio: Add kernel-doc for struct hmc5843 2015-03-19 19:03 [PATCH 0/5] Fix iio/magnetometer style warnings Cristina Opriceana ` (3 preceding siblings ...) 2015-03-19 19:07 ` [PATCH 4/5] Staging: iio: Remove line over 80 characters Cristina Opriceana @ 2015-03-19 19:10 ` Cristina Opriceana 2015-03-20 12:33 ` [Outreachy kernel] " Greg KH 4 siblings, 1 reply; 7+ messages in thread From: Cristina Opriceana @ 2015-03-19 19:10 UTC (permalink / raw) To: outreachy-kernel; +Cc: outreachy-kernel This patch documents the struct hmc5843 specific data following this warning: "CHECK: struct mutex definition without comment". Signed-off-by: Cristina Opriceana <cristina.opriceana@gmail.com> --- drivers/staging/iio/magnetometer/hmc5843.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/staging/iio/magnetometer/hmc5843.h b/drivers/staging/iio/magnetometer/hmc5843.h index 332a75c..ab729d3 100644 --- a/drivers/staging/iio/magnetometer/hmc5843.h +++ b/drivers/staging/iio/magnetometer/hmc5843.h @@ -31,12 +31,20 @@ enum hmc5843_ids { HMC5983_ID, }; +/** + * struct hcm5843_data - device specific data + * @dev actual device + * @lock update and read regmap data + * @regmap hardware access register maps + * @variant describe chip variants + * @buffer 3x 16-bit channels + padding + 64-bit timestamp + **/ struct hmc5843_data { struct device *dev; struct mutex lock; struct regmap *regmap; const struct hmc5843_chip_info *variant; - __be16 buffer[8]; /* 3x 16-bit channels + padding + 64-bit timestamp */ + __be16 buffer[8]; }; int hmc5843_common_probe(struct device *dev, struct regmap *regmap, -- 1.9.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [Outreachy kernel] [PATCH 5/5] Staging: iio: Add kernel-doc for struct hmc5843 2015-03-19 19:10 ` [PATCH 5/5] Staging: iio: Add kernel-doc for struct hmc5843 Cristina Opriceana @ 2015-03-20 12:33 ` Greg KH 0 siblings, 0 replies; 7+ messages in thread From: Greg KH @ 2015-03-20 12:33 UTC (permalink / raw) To: Cristina Opriceana; +Cc: outreachy-kernel On Thu, Mar 19, 2015 at 09:10:18PM +0200, Cristina Opriceana wrote: > This patch documents the struct hmc5843 specific data following > this warning: > "CHECK: struct mutex definition without comment". > > Signed-off-by: Cristina Opriceana <cristina.opriceana@gmail.com> > --- > drivers/staging/iio/magnetometer/hmc5843.h | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/drivers/staging/iio/magnetometer/hmc5843.h b/drivers/staging/iio/magnetometer/hmc5843.h > index 332a75c..ab729d3 100644 > --- a/drivers/staging/iio/magnetometer/hmc5843.h > +++ b/drivers/staging/iio/magnetometer/hmc5843.h > @@ -31,12 +31,20 @@ enum hmc5843_ids { > HMC5983_ID, > }; > > +/** > + * struct hcm5843_data - device specific data > + * @dev actual device Don't you need a ":" after "@dev"? That's the proper kerneldoc format, this will not properly parse. thanks, greg k-h ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2015-03-20 14:41 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-03-19 19:03 [PATCH 0/5] Fix iio/magnetometer style warnings Cristina Opriceana 2015-03-19 19:04 ` [PATCH 1/5] Staging: iio: Simplify NULL pointer condition Cristina Opriceana 2015-03-19 19:06 ` [PATCH 2/5] Staging: iio: Align function parameters to match first row Cristina Opriceana 2015-03-19 19:07 ` [PATCH 3/5] Staging: iio: Remove multiple blank lines Cristina Opriceana 2015-03-19 19:07 ` [PATCH 4/5] Staging: iio: Remove line over 80 characters Cristina Opriceana 2015-03-19 19:10 ` [PATCH 5/5] Staging: iio: Add kernel-doc for struct hmc5843 Cristina Opriceana 2015-03-20 12:33 ` [Outreachy kernel] " Greg KH
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.