From: Jonathan Cameron <jic23@kernel.org>
To: Peter Meerwald <pmeerw@pmeerw.net>, linux-iio@vger.kernel.org
Subject: Re: [PATCH v2 02/15] staging:iio:hmc5843: Rewrite init function
Date: Tue, 01 Oct 2013 10:41:16 +0100 [thread overview]
Message-ID: <524A98BC.8000405@kernel.org> (raw)
In-Reply-To: <1379619360-8150-3-git-send-email-pmeerw@pmeerw.net>
On 09/19/13 20:35, Peter Meerwald wrote:
> Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Applied to the togreg branch of iio.git
Thanks,
> ---
> drivers/staging/iio/magnetometer/hmc5843.c | 34 ++++++++++++------------------
> 1 file changed, 13 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/staging/iio/magnetometer/hmc5843.c b/drivers/staging/iio/magnetometer/hmc5843.c
> index 1b4e972..49a105d 100644
> --- a/drivers/staging/iio/magnetometer/hmc5843.c
> +++ b/drivers/staging/iio/magnetometer/hmc5843.c
> @@ -78,6 +78,7 @@ enum hmc5843_ids {
> * HMC5883: Typical data output rate
> */
> #define HMC5843_RATE_OFFSET 0x02
> +#define HMC5843_RATE_DEFAULT 0x04
> #define HMC5843_RATE_BITMASK 0x1C
> #define HMC5843_RATE_NOT_USED 0x07
>
> @@ -599,23 +600,13 @@ static const struct hmc5843_chip_info hmc5843_chip_info_tbl[] = {
> },
> };
>
> -/* Called when we have found a new HMC58X3 */
> -static void hmc5843_init_client(struct i2c_client *client,
> - const struct i2c_device_id *id)
> +static void hmc5843_init(struct hmc5843_data *data)
> {
> - struct iio_dev *indio_dev = i2c_get_clientdata(client);
> - struct hmc5843_data *data = iio_priv(indio_dev);
> -
> - data->variant = &hmc5843_chip_info_tbl[id->driver_data];
> - indio_dev->channels = data->variant->channels;
> - indio_dev->num_channels = 3;
> - hmc5843_set_meas_conf(data, data->meas_conf);
> - hmc5843_set_rate(data, data->rate);
> - hmc5843_configure(client, data->operating_mode);
> - i2c_smbus_write_byte_data(client, HMC5843_CONFIG_REG_B, data->range);
> - mutex_init(&data->lock);
> -
> - pr_info("%s initialized\n", id->name);
> + hmc5843_set_meas_conf(data, HMC5843_MEAS_CONF_NORMAL);
> + hmc5843_set_rate(data, HMC5843_RATE_DEFAULT);
> + hmc5843_configure(data->client, HMC5843_MODE_CONVERSION_CONTINUOUS);
> + i2c_smbus_write_byte_data(data->client, HMC5843_CONFIG_REG_B,
> + HMC5843_RANGE_GAIN_DEFAULT);
> }
>
> static const struct iio_info hmc5843_info = {
> @@ -638,17 +629,18 @@ static int hmc5843_probe(struct i2c_client *client,
> /* default settings at probe */
> data = iio_priv(indio_dev);
> data->client = client;
> - data->meas_conf = HMC5843_MEAS_CONF_NORMAL;
> - data->range = HMC5843_RANGE_GAIN_DEFAULT;
> - data->operating_mode = HMC5843_MODE_CONVERSION_CONTINUOUS;
> + data->variant = &hmc5843_chip_info_tbl[id->driver_data];
> + mutex_init(&data->lock);
>
> i2c_set_clientdata(client, indio_dev);
> - hmc5843_init_client(client, id);
> -
> indio_dev->info = &hmc5843_info;
> indio_dev->name = id->name;
> indio_dev->dev.parent = &client->dev;
> indio_dev->modes = INDIO_DIRECT_MODE;
> + indio_dev->channels = data->variant->channels;
> + indio_dev->num_channels = 3;
> +
> + hmc5843_init(data);
>
> err = iio_device_register(indio_dev);
> if (err)
>
next prev parent reply other threads:[~2013-10-01 8:40 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-19 19:35 [PATCH v2 00/15] staging:iio:hmc5843 cleanup Peter Meerwald
2013-09-19 19:35 ` [PATCH v2 01/15] staging:iio:hmc5843: Add pointer to i2c client to data struct Peter Meerwald
2013-09-21 10:46 ` Jonathan Cameron
2013-10-01 9:40 ` Jonathan Cameron
2013-10-01 8:44 ` Peter Meerwald
2013-10-01 10:10 ` Jonathan Cameron
2013-09-19 19:35 ` [PATCH v2 02/15] staging:iio:hmc5843: Rewrite init function Peter Meerwald
2013-10-01 9:41 ` Jonathan Cameron [this message]
2013-09-19 19:35 ` [PATCH v2 03/15] staging:iio:hmc5843: Use INFO_SAMP_FREQ Peter Meerwald
2013-10-01 9:44 ` Jonathan Cameron
2013-09-19 19:35 ` [PATCH v2 04/15] staging:iio:hmc5843: Remove unused LSB register #defines Peter Meerwald
2013-10-01 9:55 ` Jonathan Cameron
2013-09-19 19:35 ` [PATCH v2 05/15] staging:iio:hmc5843: Tighten comments Peter Meerwald
2013-09-19 19:35 ` [PATCH v2 06/15] staging:iio:hmc5843: Introduce helper functions to show/check list of int pairs Peter Meerwald
2013-10-01 9:55 ` Jonathan Cameron
2013-10-01 9:58 ` Jonathan Cameron
2013-09-19 19:35 ` [PATCH v2 07/15] staging:iio:hmc5843: Use CALIBSCALE instead of magn_range Peter Meerwald
2013-09-20 19:57 ` Jonathan Cameron
2013-09-20 20:12 ` Peter Meerwald
2013-09-20 21:54 ` Jonathan Cameron
2013-09-19 19:35 ` [PATCH v2 08/15] staging:iio:hmc5843: Always read all channels values otherwise no updates Peter Meerwald
2013-09-19 19:35 ` [PATCH v2 09/15] staging:iio:hmc5843: Add trigger handling Peter Meerwald
2013-09-19 19:35 ` [PATCH v2 10/15] staging:iio:hmc5843: Remove ability to change operating mode Peter Meerwald
2013-09-19 19:35 ` [PATCH v2 11/15] staging:iio:hmc5843: Rename _configure() to _set_mode() Peter Meerwald
2013-09-19 19:35 ` [PATCH v2 12/15] staging:iio:hmc5843: Reorganize _set_meas_conf() Peter Meerwald
2013-09-19 19:35 ` [PATCH v2 13/15] staging:iio:hmc5843: Rename _set_rate() to _set_samp_freq() Peter Meerwald
2013-09-19 19:35 ` [PATCH v2 14/15] staging:iio:hmc5843: Introduce _set_range_gain() Peter Meerwald
2013-09-19 19:36 ` [PATCH v2 15/15] staging:iio:hmc5843: Check initialization and chip identifier Peter Meerwald
2013-09-20 20:05 ` [PATCH v2 00/15] staging:iio:hmc5843 cleanup Jonathan Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=524A98BC.8000405@kernel.org \
--to=jic23@kernel.org \
--cc=linux-iio@vger.kernel.org \
--cc=pmeerw@pmeerw.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.