Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755538AbbHLQEf (ORCPT ); Wed, 12 Aug 2015 12:04:35 -0400 Received: from mga01.intel.com ([192.55.52.88]:6934 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752979AbbHLQEd (ORCPT ); Wed, 12 Aug 2015 12:04:33 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,662,1432623600"; d="scan'208";a="747242200" Message-ID: <1439395413.2244.35.camel@spandruv-desk3.jf.intel.com> Subject: Re: [PATCH v3 2/6] iio: bmg160: Remove i2c_client from data struct From: Srinivas Pandruvada To: Markus Pargmann Cc: Jonathan Cameron , Vlad Dogaru , Paul Bolle , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de Date: Wed, 12 Aug 2015 09:03:33 -0700 In-Reply-To: <1439391009-6051-3-git-send-email-mpa@pengutronix.de> References: <1439391009-6051-1-git-send-email-mpa@pengutronix.de> <1439391009-6051-3-git-send-email-mpa@pengutronix.de> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.10.4 (3.10.4-4.fc20) Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 9951 Lines: 279 On Wed, 2015-08-12 at 16:50 +0200, Markus Pargmann wrote: > i2c_client variable is not really used anymore in the core driver. It is > only used to get the device to make proper outputs. > > This patch replaces all i2c_client usage through direct usage of the > device pointer. > > Signed-off-by: Markus Pargmann Reviewed-by: Srinivas Pandruvada > --- > drivers/iio/gyro/bmg160.c | 64 +++++++++++++++++++++++------------------------ > 1 file changed, 32 insertions(+), 32 deletions(-) > > diff --git a/drivers/iio/gyro/bmg160.c b/drivers/iio/gyro/bmg160.c > index bbe02053e98a..4701ea17baea 100644 > --- a/drivers/iio/gyro/bmg160.c > +++ b/drivers/iio/gyro/bmg160.c > @@ -98,7 +98,7 @@ > #define BMG160_AUTO_SUSPEND_DELAY_MS 2000 > > struct bmg160_data { > - struct i2c_client *client; > + struct device *dev; > struct regmap *regmap; > struct iio_trigger *dready_trig; > struct iio_trigger *motion_trig; > @@ -148,7 +148,7 @@ static int bmg160_set_mode(struct bmg160_data *data, u8 mode) > > ret = regmap_write(data->regmap, BMG160_REG_PMU_LPW, mode); > if (ret < 0) { > - dev_err(&data->client->dev, "Error writing reg_pmu_lpw\n"); > + dev_err(data->dev, "Error writing reg_pmu_lpw\n"); > return ret; > } > > @@ -178,7 +178,7 @@ static int bmg160_set_bw(struct bmg160_data *data, int val) > > ret = regmap_write(data->regmap, BMG160_REG_PMU_BW, bw_bits); > if (ret < 0) { > - dev_err(&data->client->dev, "Error writing reg_pmu_bw\n"); > + dev_err(data->dev, "Error writing reg_pmu_bw\n"); > return ret; > } > > @@ -194,13 +194,13 @@ static int bmg160_chip_init(struct bmg160_data *data) > > ret = regmap_read(data->regmap, BMG160_REG_CHIP_ID, &val); > if (ret < 0) { > - dev_err(&data->client->dev, "Error reading reg_chip_id\n"); > + dev_err(data->dev, "Error reading reg_chip_id\n"); > return ret; > } > > - dev_dbg(&data->client->dev, "Chip Id %x\n", val); > + dev_dbg(data->dev, "Chip Id %x\n", val); > if (val != BMG160_CHIP_ID_VAL) { > - dev_err(&data->client->dev, "invalid chip %x\n", val); > + dev_err(data->dev, "invalid chip %x\n", val); > return -ENODEV; > } > > @@ -219,14 +219,14 @@ static int bmg160_chip_init(struct bmg160_data *data) > /* Set Default Range */ > ret = regmap_write(data->regmap, BMG160_REG_RANGE, BMG160_RANGE_500DPS); > if (ret < 0) { > - dev_err(&data->client->dev, "Error writing reg_range\n"); > + dev_err(data->dev, "Error writing reg_range\n"); > return ret; > } > data->dps_range = BMG160_RANGE_500DPS; > > ret = regmap_read(data->regmap, BMG160_REG_SLOPE_THRES, &val); > if (ret < 0) { > - dev_err(&data->client->dev, "Error reading reg_slope_thres\n"); > + dev_err(data->dev, "Error reading reg_slope_thres\n"); > return ret; > } > data->slope_thres = val; > @@ -235,7 +235,7 @@ static int bmg160_chip_init(struct bmg160_data *data) > ret = regmap_update_bits(data->regmap, BMG160_REG_INT_EN_1, > BMG160_INT1_BIT_OD, 0); > if (ret < 0) { > - dev_err(&data->client->dev, "Error updating bits in reg_int_en_1\n"); > + dev_err(data->dev, "Error updating bits in reg_int_en_1\n"); > return ret; > } > > @@ -243,7 +243,7 @@ static int bmg160_chip_init(struct bmg160_data *data) > BMG160_INT_MODE_LATCH_INT | > BMG160_INT_MODE_LATCH_RESET); > if (ret < 0) { > - dev_err(&data->client->dev, > + dev_err(data->dev, > "Error writing reg_motion_intr\n"); > return ret; > } > @@ -257,17 +257,17 @@ static int bmg160_set_power_state(struct bmg160_data *data, bool on) > int ret; > > if (on) > - ret = pm_runtime_get_sync(&data->client->dev); > + ret = pm_runtime_get_sync(data->dev); > else { > - pm_runtime_mark_last_busy(&data->client->dev); > - ret = pm_runtime_put_autosuspend(&data->client->dev); > + pm_runtime_mark_last_busy(data->dev); > + ret = pm_runtime_put_autosuspend(data->dev); > } > > if (ret < 0) { > - dev_err(&data->client->dev, > + dev_err(data->dev, > "Failed: bmg160_set_power_state for %d\n", on); > if (on) > - pm_runtime_put_noidle(&data->client->dev); > + pm_runtime_put_noidle(data->dev); > > return ret; > } > @@ -286,7 +286,7 @@ static int bmg160_setup_any_motion_interrupt(struct bmg160_data *data, > BMG160_INT_MAP_0_BIT_ANY, > (status ? BMG160_INT_MAP_0_BIT_ANY : 0)); > if (ret < 0) { > - dev_err(&data->client->dev, "Error updating bits reg_int_map0\n"); > + dev_err(data->dev, "Error updating bits reg_int_map0\n"); > return ret; > } > > @@ -296,7 +296,7 @@ static int bmg160_setup_any_motion_interrupt(struct bmg160_data *data, > ret = regmap_write(data->regmap, BMG160_REG_SLOPE_THRES, > data->slope_thres); > if (ret < 0) { > - dev_err(&data->client->dev, > + dev_err(data->dev, > "Error writing reg_slope_thres\n"); > return ret; > } > @@ -305,7 +305,7 @@ static int bmg160_setup_any_motion_interrupt(struct bmg160_data *data, > BMG160_INT_MOTION_X | BMG160_INT_MOTION_Y | > BMG160_INT_MOTION_Z); > if (ret < 0) { > - dev_err(&data->client->dev, > + dev_err(data->dev, > "Error writing reg_motion_intr\n"); > return ret; > } > @@ -321,7 +321,7 @@ static int bmg160_setup_any_motion_interrupt(struct bmg160_data *data, > BMG160_INT_MODE_LATCH_INT | > BMG160_INT_MODE_LATCH_RESET); > if (ret < 0) { > - dev_err(&data->client->dev, > + dev_err(data->dev, > "Error writing reg_rst_latch\n"); > return ret; > } > @@ -335,7 +335,7 @@ static int bmg160_setup_any_motion_interrupt(struct bmg160_data *data, > } > > if (ret < 0) { > - dev_err(&data->client->dev, "Error writing reg_int_en0\n"); > + dev_err(data->dev, "Error writing reg_int_en0\n"); > return ret; > } > > @@ -352,7 +352,7 @@ static int bmg160_setup_new_data_interrupt(struct bmg160_data *data, > BMG160_INT_MAP_1_BIT_NEW_DATA, > (status ? BMG160_INT_MAP_1_BIT_NEW_DATA : 0)); > if (ret < 0) { > - dev_err(&data->client->dev, "Error updating bits in reg_int_map1\n"); > + dev_err(data->dev, "Error updating bits in reg_int_map1\n"); > return ret; > } > > @@ -361,7 +361,7 @@ static int bmg160_setup_new_data_interrupt(struct bmg160_data *data, > BMG160_INT_MODE_NON_LATCH_INT | > BMG160_INT_MODE_LATCH_RESET); > if (ret < 0) { > - dev_err(&data->client->dev, > + dev_err(data->dev, > "Error writing reg_rst_latch\n"); > return ret; > } > @@ -375,7 +375,7 @@ static int bmg160_setup_new_data_interrupt(struct bmg160_data *data, > BMG160_INT_MODE_LATCH_INT | > BMG160_INT_MODE_LATCH_RESET); > if (ret < 0) { > - dev_err(&data->client->dev, > + dev_err(data->dev, > "Error writing reg_rst_latch\n"); > return ret; > } > @@ -384,7 +384,7 @@ static int bmg160_setup_new_data_interrupt(struct bmg160_data *data, > } > > if (ret < 0) { > - dev_err(&data->client->dev, "Error writing reg_int_en0\n"); > + dev_err(data->dev, "Error writing reg_int_en0\n"); > return ret; > } > > @@ -414,7 +414,7 @@ static int bmg160_set_scale(struct bmg160_data *data, int val) > ret = regmap_write(data->regmap, BMG160_REG_RANGE, > bmg160_scale_table[i].dps_range); > if (ret < 0) { > - dev_err(&data->client->dev, > + dev_err(data->dev, > "Error writing reg_range\n"); > return ret; > } > @@ -440,7 +440,7 @@ static int bmg160_get_temp(struct bmg160_data *data, int *val) > > ret = regmap_read(data->regmap, BMG160_REG_TEMP, &raw_val); > if (ret < 0) { > - dev_err(&data->client->dev, "Error reading reg_temp\n"); > + dev_err(data->dev, "Error reading reg_temp\n"); > bmg160_set_power_state(data, false); > mutex_unlock(&data->mutex); > return ret; > @@ -470,7 +470,7 @@ static int bmg160_get_axis(struct bmg160_data *data, int axis, int *val) > ret = regmap_bulk_read(data->regmap, BMG160_AXIS_TO_REG(axis), &raw_val, > 2); > if (ret < 0) { > - dev_err(&data->client->dev, "Error reading axis %d\n", axis); > + dev_err(data->dev, "Error reading axis %d\n", axis); > bmg160_set_power_state(data, false); > mutex_unlock(&data->mutex); > return ret; > @@ -813,7 +813,7 @@ static int bmg160_trig_try_reen(struct iio_trigger *trig) > BMG160_INT_MODE_LATCH_INT | > BMG160_INT_MODE_LATCH_RESET); > if (ret < 0) { > - dev_err(&data->client->dev, "Error writing reg_rst_latch\n"); > + dev_err(data->dev, "Error writing reg_rst_latch\n"); > return ret; > } > > @@ -879,7 +879,7 @@ static irqreturn_t bmg160_event_handler(int irq, void *private) > > ret = regmap_read(data->regmap, BMG160_REG_INT_STATUS_2, &val); > if (ret < 0) { > - dev_err(&data->client->dev, "Error reading reg_int_status2\n"); > + dev_err(data->dev, "Error reading reg_int_status2\n"); > goto ack_intr_status; > } > > @@ -916,7 +916,7 @@ ack_intr_status: > BMG160_INT_MODE_LATCH_INT | > BMG160_INT_MODE_LATCH_RESET); > if (ret < 0) > - dev_err(&data->client->dev, > + dev_err(data->dev, > "Error writing reg_rst_latch\n"); > } > > @@ -1021,7 +1021,7 @@ static int bmg160_probe(struct i2c_client *client, > > data = iio_priv(indio_dev); > i2c_set_clientdata(client, indio_dev); > - data->client = client; > + data->dev = &client->dev; > > ret = bmg160_chip_init(data); > if (ret < 0) > @@ -1188,7 +1188,7 @@ static int bmg160_runtime_suspend(struct device *dev) > > ret = bmg160_set_mode(data, BMG160_MODE_SUSPEND); > if (ret < 0) { > - dev_err(&data->client->dev, "set mode failed\n"); > + dev_err(data->dev, "set mode failed\n"); > return -EAGAIN; > } > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/