diff for duplicates of <1460991811.8946.11.camel@linux.intel.com> diff --git a/a/1.txt b/N1/1.txt index c206315..1855ced 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -7,8 +7,8 @@ On Sat, 2016-04-16 at 20:24 +0100, Jonathan Cameron wrote: > > > > Patch created using Coccinelle plus manual edits. > > -> > Signed-off-by: Alison Schofield <amsfield22@gmail.com> -Reviewed-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> +> > Signed-off-by: Alison Schofield <amsfield22-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> +Reviewed-by: Srinivas Pandruvada <srinivas.pandruvada-VuQAYsv1563Yd54FQh9/CA@public.gmane.org> > Cc'd Srinivas > diff --git a/a/content_digest b/N1/content_digest index 7a4db5b..9920d63 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,20 +1,21 @@ "ref\0cover.1460314070.git.amsfield22@gmail.com\0" "ref\063dd9227f9a7e56f7e03f8963e798e6d7d8bb70f.1460314070.git.amsfield22@gmail.com\0" "ref\057129157.3080603@kernel.org\0" - "From\0Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>\0" + "ref\057129157.3080603-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org\0" + "From\0Srinivas Pandruvada <srinivas.pandruvada-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>\0" "Subject\0Re: [PATCH v2 5/5] iio: gyro: bmg160: use regmap to retrieve struct device\0" "Date\0Mon, 18 Apr 2016 08:03:31 -0700\0" - "To\0Jonathan Cameron <jic23@kernel.org>" - " Alison Schofield <amsfield22@gmail.com>\0" - "Cc\0knaack.h@gmx.de" - lars@metafoo.de - pmeerw@pmeerw.net - kgene@kernel.org - k.kozlowski@samsung.com - linux-iio@vger.kernel.org - linux-kernel@vger.kernel.org - linux-arm-kernel@lists.infradead.org - " linux-samsung-soc@vger.kernel.org\0" + "To\0Jonathan Cameron <jic23-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>" + " Alison Schofield <amsfield22-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" + "Cc\0knaack.h-Mmb7MZpHnFY@public.gmane.org" + lars-Qo5EllUWu/uELgA04lAiVw@public.gmane.org + pmeerw-jW+XmwGofnusTnJN9+BGXg@public.gmane.org + kgene-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org + k.kozlowski-Sze3O3UU22JBDgjK7y7TUQ@public.gmane.org + linux-iio-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + " linux-samsung-soc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" "\00:1\0" "b\0" "On Sat, 2016-04-16 at 20:24 +0100, Jonathan Cameron wrote:\n" @@ -26,8 +27,8 @@ "> > \n" "> > Patch created using Coccinelle plus manual edits.\n" "> > \n" - "> > Signed-off-by: Alison Schofield <amsfield22@gmail.com>\n" - "Reviewed-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>\n" + "> > Signed-off-by: Alison Schofield <amsfield22-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" + "Reviewed-by: Srinivas Pandruvada <srinivas.pandruvada-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>\n" "\n" "> Cc'd Srinivas\n" "> \n" @@ -462,4 +463,4 @@ "> > \302\240\n" > > -3e004fde518eeda12075e5a558c00b6a714e0d23b1d886eff83b8d0e583f79bf +45a4263b95541f0b343c39acfc7def2e2c8f003e3583f681a097bb4fe07e7ab4
diff --git a/a/1.txt b/N2/1.txt index c206315..3a22e6e 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -17,9 +17,9 @@ Reviewed-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> > Not terribly relevant lists... > > > > --- -> > drivers/iio/gyro/bmg160_core.c | 86 +++++++++++++++++++++--------- +> > ?drivers/iio/gyro/bmg160_core.c | 86 +++++++++++++++++++++--------- > > ------------ -> > 1 file changed, 44 insertions(+), 42 deletions(-) +> > ?1 file changed, 44 insertions(+), 42 deletions(-) > > > > diff --git a/drivers/iio/gyro/bmg160_core.c > > b/drivers/iio/gyro/bmg160_core.c @@ -27,418 +27,418 @@ Reviewed-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> > > --- a/drivers/iio/gyro/bmg160_core.c > > +++ b/drivers/iio/gyro/bmg160_core.c > > @@ -95,7 +95,6 @@ -> > #define BMG160_AUTO_SUSPEND_DELAY_MS 2000 -> > -> > struct bmg160_data { +> > ?#define BMG160_AUTO_SUSPEND_DELAY_MS 2000 +> > ? +> > ?struct bmg160_data { > > - struct device *dev; -> > struct regmap *regmap; -> > struct iio_trigger *dready_trig; -> > struct iio_trigger *motion_trig; +> > ? struct regmap *regmap; +> > ? struct iio_trigger *dready_trig; +> > ? struct iio_trigger *motion_trig; > > @@ -137,11 +136,12 @@ static const struct { -> > -> > static int bmg160_set_mode(struct bmg160_data *data, u8 mode) -> > { +> > ? +> > ?static int bmg160_set_mode(struct bmg160_data *data, u8 mode) +> > ?{ > > + struct device *dev = regmap_get_device(data->regmap); -> > int ret; -> > -> > ret = regmap_write(data->regmap, BMG160_REG_PMU_LPW, +> > ? int ret; +> > ? +> > ? ret = regmap_write(data->regmap, BMG160_REG_PMU_LPW, > > mode); -> > if (ret < 0) { +> > ? if (ret < 0) { > > - dev_err(data->dev, "Error writing reg_pmu_lpw\n"); > > + dev_err(dev, "Error writing reg_pmu_lpw\n"); -> > return ret; -> > } -> > +> > ? return ret; +> > ? } +> > ? > > @@ -162,6 +162,7 @@ static int bmg160_convert_freq_to_bit(int val) -> > -> > static int bmg160_set_bw(struct bmg160_data *data, int val) -> > { +> > ? +> > ?static int bmg160_set_bw(struct bmg160_data *data, int val) +> > ?{ > > + struct device *dev = regmap_get_device(data->regmap); -> > int ret; -> > int bw_bits; -> > +> > ? int ret; +> > ? int bw_bits; +> > ? > > @@ -171,7 +172,7 @@ static int bmg160_set_bw(struct bmg160_data > > *data, int val) -> > -> > ret = regmap_write(data->regmap, BMG160_REG_PMU_BW, +> > ? +> > ? ret = regmap_write(data->regmap, BMG160_REG_PMU_BW, > > bw_bits); -> > if (ret < 0) { +> > ? if (ret < 0) { > > - dev_err(data->dev, "Error writing reg_pmu_bw\n"); > > + dev_err(dev, "Error writing reg_pmu_bw\n"); -> > return ret; -> > } -> > +> > ? return ret; +> > ? } +> > ? > > @@ -182,18 +183,19 @@ static int bmg160_set_bw(struct bmg160_data > > *data, int val) -> > -> > static int bmg160_chip_init(struct bmg160_data *data) -> > { +> > ? +> > ?static int bmg160_chip_init(struct bmg160_data *data) +> > ?{ > > + struct device *dev = regmap_get_device(data->regmap); -> > int ret; -> > unsigned int val; -> > -> > ret = regmap_read(data->regmap, BMG160_REG_CHIP_ID, &val); -> > if (ret < 0) { +> > ? int ret; +> > ? unsigned int val; +> > ? +> > ? ret = regmap_read(data->regmap, BMG160_REG_CHIP_ID, &val); +> > ? if (ret < 0) { > > - dev_err(data->dev, "Error reading reg_chip_id\n"); > > + dev_err(dev, "Error reading reg_chip_id\n"); -> > return ret; -> > } -> > +> > ? return ret; +> > ? } +> > ? > > - dev_dbg(data->dev, "Chip Id %x\n", val); > > + dev_dbg(dev, "Chip Id %x\n", val); -> > if (val != BMG160_CHIP_ID_VAL) { +> > ? if (val != BMG160_CHIP_ID_VAL) { > > - dev_err(data->dev, "invalid chip %x\n", val); > > + dev_err(dev, "invalid chip %x\n", val); -> > return -ENODEV; -> > } -> > +> > ? return -ENODEV; +> > ? } +> > ? > > @@ -212,14 +214,14 @@ static int bmg160_chip_init(struct > > bmg160_data *data) -> > /* Set Default Range */ -> > ret = regmap_write(data->regmap, BMG160_REG_RANGE, +> > ? /* Set Default Range */ +> > ? ret = regmap_write(data->regmap, BMG160_REG_RANGE, > > BMG160_RANGE_500DPS); -> > if (ret < 0) { +> > ? if (ret < 0) { > > - dev_err(data->dev, "Error writing reg_range\n"); > > + dev_err(dev, "Error writing reg_range\n"); -> > return ret; -> > } -> > data->dps_range = BMG160_RANGE_500DPS; -> > -> > ret = regmap_read(data->regmap, BMG160_REG_SLOPE_THRES, +> > ? return ret; +> > ? } +> > ? data->dps_range = BMG160_RANGE_500DPS; +> > ? +> > ? ret = regmap_read(data->regmap, BMG160_REG_SLOPE_THRES, > > &val); -> > if (ret < 0) { +> > ? if (ret < 0) { > > - dev_err(data->dev, "Error reading > > reg_slope_thres\n"); > > + dev_err(dev, "Error reading reg_slope_thres\n"); -> > return ret; -> > } -> > data->slope_thres = val; +> > ? return ret; +> > ? } +> > ? data->slope_thres = val; > > @@ -228,7 +230,7 @@ static int bmg160_chip_init(struct bmg160_data > > *data) -> > ret = regmap_update_bits(data->regmap, +> > ? ret = regmap_update_bits(data->regmap, > > BMG160_REG_INT_EN_1, -> > BMG160_INT1_BIT_OD, 0); -> > if (ret < 0) { +> > ? ?BMG160_INT1_BIT_OD, 0); +> > ? if (ret < 0) { > > - dev_err(data->dev, "Error updating bits in > > reg_int_en_1\n"); > > + dev_err(dev, "Error updating bits in > > reg_int_en_1\n"); -> > return ret; -> > } -> > +> > ? return ret; +> > ? } +> > ? > > @@ -236,7 +238,7 @@ static int bmg160_chip_init(struct bmg160_data > > *data) -> > BMG160_INT_MODE_LATCH_INT | -> > BMG160_INT_MODE_LATCH_RESET); -> > if (ret < 0) { +> > ? ???BMG160_INT_MODE_LATCH_INT | +> > ? ???BMG160_INT_MODE_LATCH_RESET); +> > ? if (ret < 0) { > > - dev_err(data->dev, > > + dev_err(dev, -> > "Error writing reg_motion_intr\n"); -> > return ret; -> > } +> > ? "Error writing reg_motion_intr\n"); +> > ? return ret; +> > ? } > > @@ -247,20 +249,21 @@ static int bmg160_chip_init(struct > > bmg160_data *data) -> > static int bmg160_set_power_state(struct bmg160_data *data, bool +> > ?static int bmg160_set_power_state(struct bmg160_data *data, bool > > on) -> > { -> > #ifdef CONFIG_PM +> > ?{ +> > ?#ifdef CONFIG_PM > > + struct device *dev = regmap_get_device(data->regmap); -> > int ret; -> > -> > if (on) +> > ? int ret; +> > ? +> > ? if (on) > > - ret = pm_runtime_get_sync(data->dev); > > + ret = pm_runtime_get_sync(dev); -> > else { +> > ? else { > > - pm_runtime_mark_last_busy(data->dev); > > - ret = pm_runtime_put_autosuspend(data->dev); > > + pm_runtime_mark_last_busy(dev); > > + ret = pm_runtime_put_autosuspend(dev); -> > } -> > -> > if (ret < 0) { +> > ? } +> > ? +> > ? if (ret < 0) { > > - dev_err(data->dev, > > - "Failed: bmg160_set_power_state for %d\n", > > on); > > + dev_err(dev, "Failed: bmg160_set_power_state for > > %d\n", on); > > + -> > if (on) +> > ? if (on) > > - pm_runtime_put_noidle(data->dev); > > + pm_runtime_put_noidle(dev); -> > -> > return ret; -> > } +> > ? +> > ? return ret; +> > ? } > > @@ -272,6 +275,7 @@ static int bmg160_set_power_state(struct > > bmg160_data *data, bool on) -> > static int bmg160_setup_any_motion_interrupt(struct bmg160_data +> > ?static int bmg160_setup_any_motion_interrupt(struct bmg160_data > > *data, -> > bool status) -> > { +> > ? ?????bool status) +> > ?{ > > + struct device *dev = regmap_get_device(data->regmap); -> > int ret; -> > -> > /* Enable/Disable INT_MAP0 mapping */ +> > ? int ret; +> > ? +> > ? /* Enable/Disable INT_MAP0 mapping */ > > @@ -279,7 +283,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, +> > ? ?(status ? > > BMG160_INT_MAP_0_BIT_ANY : 0)); -> > if (ret < 0) { +> > ? if (ret < 0) { > > - dev_err(data->dev, "Error updating bits > > reg_int_map0\n"); > > + dev_err(dev, "Error updating bits > > reg_int_map0\n"); -> > return ret; -> > } -> > +> > ? return ret; +> > ? } +> > ? > > @@ -289,8 +293,7 @@ static int > > bmg160_setup_any_motion_interrupt(struct bmg160_data *data, -> > ret = regmap_write(data->regmap, +> > ? ret = regmap_write(data->regmap, > > BMG160_REG_SLOPE_THRES, -> > data->slope_thres); -> > if (ret < 0) { +> > ? ???data->slope_thres); +> > ? if (ret < 0) { > > - dev_err(data->dev, > > - "Error writing > > reg_slope_thres\n"); > > + dev_err(dev, "Error writing > > reg_slope_thres\n"); -> > return ret; -> > } -> > +> > ? return ret; +> > ? } +> > ? > > @@ -298,8 +301,7 @@ static int > > bmg160_setup_any_motion_interrupt(struct bmg160_data *data, -> > BMG160_INT_MOTION_X | +> > ? ???BMG160_INT_MOTION_X | > > BMG160_INT_MOTION_Y | -> > BMG160_INT_MOTION_Z); -> > if (ret < 0) { +> > ? ???BMG160_INT_MOTION_Z); +> > ? if (ret < 0) { > > - dev_err(data->dev, > > - "Error writing > > reg_motion_intr\n"); > > + dev_err(dev, "Error writing > > reg_motion_intr\n"); -> > return ret; -> > } -> > +> > ? return ret; +> > ? } +> > ? > > @@ -314,8 +316,7 @@ static int > > bmg160_setup_any_motion_interrupt(struct bmg160_data *data, -> > BMG160_INT_MODE_LATCH_I +> > ? ???BMG160_INT_MODE_LATCH_I > > NT | -> > BMG160_INT_MODE_LATCH_R +> > ? ???BMG160_INT_MODE_LATCH_R > > ESET); -> > if (ret < 0) { +> > ? if (ret < 0) { > > - dev_err(data->dev, > > - "Error writing > > reg_rst_latch\n"); > > + dev_err(dev, "Error writing > > reg_rst_latch\n"); -> > return ret; -> > } -> > } +> > ? return ret; +> > ? } +> > ? } > > @@ -328,7 +329,7 @@ static int > > bmg160_setup_any_motion_interrupt(struct bmg160_data *data, -> > } -> > -> > if (ret < 0) { +> > ? } +> > ? +> > ? if (ret < 0) { > > - dev_err(data->dev, "Error writing reg_int_en0\n"); > > + dev_err(dev, "Error writing reg_int_en0\n"); -> > return ret; -> > } -> > +> > ? return ret; +> > ? } +> > ? > > @@ -338,6 +339,7 @@ static int > > bmg160_setup_any_motion_interrupt(struct bmg160_data *data, -> > static int bmg160_setup_new_data_interrupt(struct bmg160_data +> > ?static int bmg160_setup_new_data_interrupt(struct bmg160_data > > *data, -> > bool status) -> > { +> > ? ???bool status) +> > ?{ > > + struct device *dev = regmap_get_device(data->regmap); -> > int ret; -> > -> > /* Enable/Disable INT_MAP1 mapping */ +> > ? int ret; +> > ? +> > ? /* Enable/Disable INT_MAP1 mapping */ > > @@ -345,7 +347,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, +> > ? ?(status ? > > BMG160_INT_MAP_1_BIT_NEW_DATA : 0)); -> > if (ret < 0) { +> > ? if (ret < 0) { > > - dev_err(data->dev, "Error updating bits in > > reg_int_map1\n"); > > + dev_err(dev, "Error updating bits in > > reg_int_map1\n"); -> > return ret; -> > } -> > +> > ? return ret; +> > ? } +> > ? > > @@ -354,9 +356,8 @@ 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) { +> > ? ???BMG160_INT_MODE_NON_LATCH_INT | +> > ? ???BMG160_INT_MODE_LATCH_RESET); +> > ? if (ret < 0) { > > - dev_err(data->dev, > > - "Error writing reg_rst_latch\n"); > > - return ret; > > + dev_err(dev, "Error writing > > reg_rst_latch\n"); > > + return ret; -> > } -> > -> > ret = regmap_write(data->regmap, +> > ? } +> > ? +> > ? ret = regmap_write(data->regmap, > > BMG160_REG_INT_EN_0, > > @@ -368,16 +369,15 @@ static int > > bmg160_setup_new_data_interrupt(struct bmg160_data *data, -> > BMG160_INT_MODE_LATCH_INT | -> > BMG160_INT_MODE_LATCH_RESET); -> > if (ret < 0) { +> > ? ???BMG160_INT_MODE_LATCH_INT | +> > ? ???BMG160_INT_MODE_LATCH_RESET); +> > ? if (ret < 0) { > > - dev_err(data->dev, > > - "Error writing reg_rst_latch\n"); > > - return ret; > > + dev_err(dev, "Error writing > > reg_rst_latch\n"); > > + return ret; -> > } -> > -> > ret = regmap_write(data->regmap, +> > ? } +> > ? +> > ? ret = regmap_write(data->regmap, > > BMG160_REG_INT_EN_0, 0); -> > } -> > -> > if (ret < 0) { +> > ? } +> > ? +> > ? if (ret < 0) { > > - dev_err(data->dev, "Error writing reg_int_en0\n"); > > + dev_err(dev, "Error writing reg_int_en0\n"); -> > return ret; -> > } -> > +> > ? return ret; +> > ? } +> > ? > > @@ -400,6 +400,7 @@ static int bmg160_get_bw(struct bmg160_data > > *data, int *val) -> > -> > static int bmg160_set_scale(struct bmg160_data *data, int val) -> > { +> > ? +> > ?static int bmg160_set_scale(struct bmg160_data *data, int val) +> > ?{ > > + struct device *dev = regmap_get_device(data->regmap); -> > int ret, i; -> > -> > for (i = 0; i < ARRAY_SIZE(bmg160_scale_table); ++i) { +> > ? int ret, i; +> > ? +> > ? for (i = 0; i < ARRAY_SIZE(bmg160_scale_table); ++i) { > > @@ -407,8 +408,7 @@ static int bmg160_set_scale(struct bmg160_data > > *data, int val) -> > ret = regmap_write(data->regmap, +> > ? ret = regmap_write(data->regmap, > > BMG160_REG_RANGE, -> > bmg160_scale_table[i].d +> > ? ???bmg160_scale_table[i].d > > ps_range); -> > if (ret < 0) { +> > ? if (ret < 0) { > > - dev_err(data->dev, > > - "Error writing > > reg_range\n"); > > + dev_err(dev, "Error writing > > reg_range\n"); -> > return ret; -> > } -> > data->dps_range = +> > ? return ret; +> > ? } +> > ? data->dps_range = > > bmg160_scale_table[i].dps_range; > > @@ -421,6 +421,7 @@ static int bmg160_set_scale(struct bmg160_data > > *data, int val) -> > -> > static int bmg160_get_temp(struct bmg160_data *data, int *val) -> > { +> > ? +> > ?static int bmg160_get_temp(struct bmg160_data *data, int *val) +> > ?{ > > + struct device *dev = regmap_get_device(data->regmap); -> > int ret; -> > unsigned int raw_val; -> > +> > ? int ret; +> > ? unsigned int raw_val; +> > ? > > @@ -433,7 +434,7 @@ static int bmg160_get_temp(struct bmg160_data > > *data, int *val) -> > -> > ret = regmap_read(data->regmap, BMG160_REG_TEMP, +> > ? +> > ? ret = regmap_read(data->regmap, BMG160_REG_TEMP, > > &raw_val); -> > if (ret < 0) { +> > ? if (ret < 0) { > > - dev_err(data->dev, "Error reading reg_temp\n"); > > + dev_err(dev, "Error reading reg_temp\n"); -> > bmg160_set_power_state(data, false); -> > mutex_unlock(&data->mutex); -> > return ret; +> > ? bmg160_set_power_state(data, false); +> > ? mutex_unlock(&data->mutex); +> > ? return ret; > > @@ -450,6 +451,7 @@ static int bmg160_get_temp(struct bmg160_data > > *data, int *val) -> > -> > static int bmg160_get_axis(struct bmg160_data *data, int axis, int +> > ? +> > ?static int bmg160_get_axis(struct bmg160_data *data, int axis, int > > *val) -> > { +> > ?{ > > + struct device *dev = regmap_get_device(data->regmap); -> > int ret; -> > unsigned int raw_val; -> > +> > ? int ret; +> > ? unsigned int raw_val; +> > ? > > @@ -463,7 +465,7 @@ static int bmg160_get_axis(struct bmg160_data > > *data, int axis, int *val) -> > ret = regmap_bulk_read(data->regmap, +> > ? ret = regmap_bulk_read(data->regmap, > > BMG160_AXIS_TO_REG(axis), &raw_val, -> > 2); -> > if (ret < 0) { +> > ? ???????2); +> > ? if (ret < 0) { > > - dev_err(data->dev, "Error reading axis %d\n", > > axis); > > + dev_err(dev, "Error reading axis %d\n", axis); -> > bmg160_set_power_state(data, false); -> > mutex_unlock(&data->mutex); -> > return ret; +> > ? bmg160_set_power_state(data, false); +> > ? mutex_unlock(&data->mutex); +> > ? return ret; > > @@ -793,6 +795,7 @@ static int bmg160_trig_try_reen(struct > > iio_trigger *trig) -> > { -> > struct iio_dev *indio_dev = iio_trigger_get_drvdata(trig); -> > struct bmg160_data *data = iio_priv(indio_dev); +> > ?{ +> > ? struct iio_dev *indio_dev = iio_trigger_get_drvdata(trig); +> > ? struct bmg160_data *data = iio_priv(indio_dev); > > + struct device *dev = regmap_get_device(data->regmap); -> > int ret; -> > -> > /* new data interrupts don't need ack */ +> > ? int ret; +> > ? +> > ? /* new data interrupts don't need ack */ > > @@ -804,7 +807,7 @@ static int bmg160_trig_try_reen(struct > > iio_trigger *trig) -> > BMG160_INT_MODE_LATCH_INT | -> > BMG160_INT_MODE_LATCH_RESET); -> > if (ret < 0) { +> > ? ???BMG160_INT_MODE_LATCH_INT | +> > ? ???BMG160_INT_MODE_LATCH_RESET); +> > ? if (ret < 0) { > > - dev_err(data->dev, "Error writing > > reg_rst_latch\n"); > > + dev_err(dev, "Error writing reg_rst_latch\n"); -> > return ret; -> > } -> > +> > ? return ret; +> > ? } +> > ? > > @@ -864,13 +867,14 @@ static irqreturn_t bmg160_event_handler(int > > irq, void *private) -> > { -> > struct iio_dev *indio_dev = private; -> > struct bmg160_data *data = iio_priv(indio_dev); +> > ?{ +> > ? struct iio_dev *indio_dev = private; +> > ? struct bmg160_data *data = iio_priv(indio_dev); > > + struct device *dev = regmap_get_device(data->regmap); -> > int ret; -> > int dir; -> > unsigned int val; -> > -> > ret = regmap_read(data->regmap, BMG160_REG_INT_STATUS_2, +> > ? int ret; +> > ? int dir; +> > ? unsigned int val; +> > ? +> > ? ret = regmap_read(data->regmap, BMG160_REG_INT_STATUS_2, > > &val); -> > if (ret < 0) { +> > ? if (ret < 0) { > > - dev_err(data->dev, "Error reading > > reg_int_status2\n"); > > + dev_err(dev, "Error reading reg_int_status2\n"); -> > goto ack_intr_status; -> > } -> > +> > ? goto ack_intr_status; +> > ? } +> > ? > > @@ -907,8 +911,7 @@ ack_intr_status: -> > BMG160_INT_MODE_LATCH_INT | -> > BMG160_INT_MODE_LATCH_RESET); -> > if (ret < 0) +> > ? ???BMG160_INT_MODE_LATCH_INT | +> > ? ???BMG160_INT_MODE_LATCH_RESET); +> > ? if (ret < 0) > > - dev_err(data->dev, > > - "Error writing reg_rst_latch\n"); > > + dev_err(dev, "Error writing > > reg_rst_latch\n"); -> > } -> > -> > return IRQ_HANDLED; +> > ? } +> > ? +> > ? return IRQ_HANDLED; > > @@ -976,7 +979,6 @@ int bmg160_core_probe(struct device *dev, > > struct regmap *regmap, int irq, -> > -> > data = iio_priv(indio_dev); -> > dev_set_drvdata(dev, indio_dev); +> > ? +> > ? data = iio_priv(indio_dev); +> > ? dev_set_drvdata(dev, indio_dev); > > - data->dev = dev; -> > data->irq = irq; -> > data->regmap = regmap; -> > +> > ? data->irq = irq; +> > ? data->regmap = regmap; +> > ? > > @@ -1139,7 +1141,7 @@ static int bmg160_runtime_suspend(struct > > device *dev) -> > -> > ret = bmg160_set_mode(data, BMG160_MODE_SUSPEND); -> > if (ret < 0) { +> > ? +> > ? ret = bmg160_set_mode(data, BMG160_MODE_SUSPEND); +> > ? if (ret < 0) { > > - dev_err(data->dev, "set mode failed\n"); > > + dev_err(dev, "set mode failed\n"); -> > return -EAGAIN; -> > } -> > +> > ? return -EAGAIN; +> > ? } +> > ? > > diff --git a/a/content_digest b/N2/content_digest index 7a4db5b..9c4fc14 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,20 +1,10 @@ "ref\0cover.1460314070.git.amsfield22@gmail.com\0" "ref\063dd9227f9a7e56f7e03f8963e798e6d7d8bb70f.1460314070.git.amsfield22@gmail.com\0" "ref\057129157.3080603@kernel.org\0" - "From\0Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>\0" - "Subject\0Re: [PATCH v2 5/5] iio: gyro: bmg160: use regmap to retrieve struct device\0" + "From\0srinivas.pandruvada@linux.intel.com (Srinivas Pandruvada)\0" + "Subject\0[PATCH v2 5/5] iio: gyro: bmg160: use regmap to retrieve struct device\0" "Date\0Mon, 18 Apr 2016 08:03:31 -0700\0" - "To\0Jonathan Cameron <jic23@kernel.org>" - " Alison Schofield <amsfield22@gmail.com>\0" - "Cc\0knaack.h@gmx.de" - lars@metafoo.de - pmeerw@pmeerw.net - kgene@kernel.org - k.kozlowski@samsung.com - linux-iio@vger.kernel.org - linux-kernel@vger.kernel.org - linux-arm-kernel@lists.infradead.org - " linux-samsung-soc@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Sat, 2016-04-16 at 20:24 +0100, Jonathan Cameron wrote:\n" @@ -36,9 +26,9 @@ "> Not terribly relevant lists...\n" "> > \n" "> > ---\n" - "> > \302\240drivers/iio/gyro/bmg160_core.c | 86 +++++++++++++++++++++---------\n" + "> > ?drivers/iio/gyro/bmg160_core.c | 86 +++++++++++++++++++++---------\n" "> > ------------\n" - "> > \302\2401 file changed, 44 insertions(+), 42 deletions(-)\n" + "> > ?1 file changed, 44 insertions(+), 42 deletions(-)\n" "> > \n" "> > diff --git a/drivers/iio/gyro/bmg160_core.c\n" "> > b/drivers/iio/gyro/bmg160_core.c\n" @@ -46,420 +36,420 @@ "> > --- a/drivers/iio/gyro/bmg160_core.c\n" "> > +++ b/drivers/iio/gyro/bmg160_core.c\n" "> > @@ -95,7 +95,6 @@\n" - "> > \302\240#define BMG160_AUTO_SUSPEND_DELAY_MS\t2000\n" - "> > \302\240\n" - "> > \302\240struct bmg160_data {\n" + "> > ?#define BMG160_AUTO_SUSPEND_DELAY_MS\t2000\n" + "> > ?\n" + "> > ?struct bmg160_data {\n" "> > -\tstruct device *dev;\n" - "> > \302\240\tstruct regmap *regmap;\n" - "> > \302\240\tstruct iio_trigger *dready_trig;\n" - "> > \302\240\tstruct iio_trigger *motion_trig;\n" + "> > ?\tstruct regmap *regmap;\n" + "> > ?\tstruct iio_trigger *dready_trig;\n" + "> > ?\tstruct iio_trigger *motion_trig;\n" "> > @@ -137,11 +136,12 @@ static const struct {\n" - "> > \302\240\n" - "> > \302\240static int bmg160_set_mode(struct bmg160_data *data, u8 mode)\n" - "> > \302\240{\n" + "> > ?\n" + "> > ?static int bmg160_set_mode(struct bmg160_data *data, u8 mode)\n" + "> > ?{\n" "> > +\tstruct device *dev = regmap_get_device(data->regmap);\n" - "> > \302\240\tint ret;\n" - "> > \302\240\n" - "> > \302\240\tret = regmap_write(data->regmap, BMG160_REG_PMU_LPW,\n" + "> > ?\tint ret;\n" + "> > ?\n" + "> > ?\tret = regmap_write(data->regmap, BMG160_REG_PMU_LPW,\n" "> > mode);\n" - "> > \302\240\tif (ret < 0) {\n" + "> > ?\tif (ret < 0) {\n" "> > -\t\tdev_err(data->dev, \"Error writing reg_pmu_lpw\\n\");\n" "> > +\t\tdev_err(dev, \"Error writing reg_pmu_lpw\\n\");\n" - "> > \302\240\t\treturn ret;\n" - "> > \302\240\t}\n" - "> > \302\240\n" + "> > ?\t\treturn ret;\n" + "> > ?\t}\n" + "> > ?\n" "> > @@ -162,6 +162,7 @@ static int bmg160_convert_freq_to_bit(int val)\n" - "> > \302\240\n" - "> > \302\240static int bmg160_set_bw(struct bmg160_data *data, int val)\n" - "> > \302\240{\n" + "> > ?\n" + "> > ?static int bmg160_set_bw(struct bmg160_data *data, int val)\n" + "> > ?{\n" "> > +\tstruct device *dev = regmap_get_device(data->regmap);\n" - "> > \302\240\tint ret;\n" - "> > \302\240\tint bw_bits;\n" - "> > \302\240\n" + "> > ?\tint ret;\n" + "> > ?\tint bw_bits;\n" + "> > ?\n" "> > @@ -171,7 +172,7 @@ static int bmg160_set_bw(struct bmg160_data\n" "> > *data, int val)\n" - "> > \302\240\n" - "> > \302\240\tret = regmap_write(data->regmap, BMG160_REG_PMU_BW,\n" + "> > ?\n" + "> > ?\tret = regmap_write(data->regmap, BMG160_REG_PMU_BW,\n" "> > bw_bits);\n" - "> > \302\240\tif (ret < 0) {\n" + "> > ?\tif (ret < 0) {\n" "> > -\t\tdev_err(data->dev, \"Error writing reg_pmu_bw\\n\");\n" "> > +\t\tdev_err(dev, \"Error writing reg_pmu_bw\\n\");\n" - "> > \302\240\t\treturn ret;\n" - "> > \302\240\t}\n" - "> > \302\240\n" + "> > ?\t\treturn ret;\n" + "> > ?\t}\n" + "> > ?\n" "> > @@ -182,18 +183,19 @@ static int bmg160_set_bw(struct bmg160_data\n" "> > *data, int val)\n" - "> > \302\240\n" - "> > \302\240static int bmg160_chip_init(struct bmg160_data *data)\n" - "> > \302\240{\n" + "> > ?\n" + "> > ?static int bmg160_chip_init(struct bmg160_data *data)\n" + "> > ?{\n" "> > +\tstruct device *dev = regmap_get_device(data->regmap);\n" - "> > \302\240\tint ret;\n" - "> > \302\240\tunsigned int val;\n" - "> > \302\240\n" - "> > \302\240\tret = regmap_read(data->regmap, BMG160_REG_CHIP_ID, &val);\n" - "> > \302\240\tif (ret < 0) {\n" + "> > ?\tint ret;\n" + "> > ?\tunsigned int val;\n" + "> > ?\n" + "> > ?\tret = regmap_read(data->regmap, BMG160_REG_CHIP_ID, &val);\n" + "> > ?\tif (ret < 0) {\n" "> > -\t\tdev_err(data->dev, \"Error reading reg_chip_id\\n\");\n" "> > +\t\tdev_err(dev, \"Error reading reg_chip_id\\n\");\n" - "> > \302\240\t\treturn ret;\n" - "> > \302\240\t}\n" - "> > \302\240\n" + "> > ?\t\treturn ret;\n" + "> > ?\t}\n" + "> > ?\n" "> > -\tdev_dbg(data->dev, \"Chip Id %x\\n\", val);\n" "> > +\tdev_dbg(dev, \"Chip Id %x\\n\", val);\n" - "> > \302\240\tif (val != BMG160_CHIP_ID_VAL) {\n" + "> > ?\tif (val != BMG160_CHIP_ID_VAL) {\n" "> > -\t\tdev_err(data->dev, \"invalid chip %x\\n\", val);\n" "> > +\t\tdev_err(dev, \"invalid chip %x\\n\", val);\n" - "> > \302\240\t\treturn -ENODEV;\n" - "> > \302\240\t}\n" - "> > \302\240\n" + "> > ?\t\treturn -ENODEV;\n" + "> > ?\t}\n" + "> > ?\n" "> > @@ -212,14 +214,14 @@ static int bmg160_chip_init(struct\n" "> > bmg160_data *data)\n" - "> > \302\240\t/* Set Default Range */\n" - "> > \302\240\tret = regmap_write(data->regmap, BMG160_REG_RANGE,\n" + "> > ?\t/* Set Default Range */\n" + "> > ?\tret = regmap_write(data->regmap, BMG160_REG_RANGE,\n" "> > BMG160_RANGE_500DPS);\n" - "> > \302\240\tif (ret < 0) {\n" + "> > ?\tif (ret < 0) {\n" "> > -\t\tdev_err(data->dev, \"Error writing reg_range\\n\");\n" "> > +\t\tdev_err(dev, \"Error writing reg_range\\n\");\n" - "> > \302\240\t\treturn ret;\n" - "> > \302\240\t}\n" - "> > \302\240\tdata->dps_range = BMG160_RANGE_500DPS;\n" - "> > \302\240\n" - "> > \302\240\tret = regmap_read(data->regmap, BMG160_REG_SLOPE_THRES,\n" + "> > ?\t\treturn ret;\n" + "> > ?\t}\n" + "> > ?\tdata->dps_range = BMG160_RANGE_500DPS;\n" + "> > ?\n" + "> > ?\tret = regmap_read(data->regmap, BMG160_REG_SLOPE_THRES,\n" "> > &val);\n" - "> > \302\240\tif (ret < 0) {\n" + "> > ?\tif (ret < 0) {\n" "> > -\t\tdev_err(data->dev, \"Error reading\n" "> > reg_slope_thres\\n\");\n" "> > +\t\tdev_err(dev, \"Error reading reg_slope_thres\\n\");\n" - "> > \302\240\t\treturn ret;\n" - "> > \302\240\t}\n" - "> > \302\240\tdata->slope_thres = val;\n" + "> > ?\t\treturn ret;\n" + "> > ?\t}\n" + "> > ?\tdata->slope_thres = val;\n" "> > @@ -228,7 +230,7 @@ static int bmg160_chip_init(struct bmg160_data\n" "> > *data)\n" - "> > \302\240\tret = regmap_update_bits(data->regmap,\n" + "> > ?\tret = regmap_update_bits(data->regmap,\n" "> > BMG160_REG_INT_EN_1,\n" - "> > \302\240\t\t\t\t\302\240BMG160_INT1_BIT_OD, 0);\n" - "> > \302\240\tif (ret < 0) {\n" + "> > ?\t\t\t\t?BMG160_INT1_BIT_OD, 0);\n" + "> > ?\tif (ret < 0) {\n" "> > -\t\tdev_err(data->dev, \"Error updating bits in\n" "> > reg_int_en_1\\n\");\n" "> > +\t\tdev_err(dev, \"Error updating bits in\n" "> > reg_int_en_1\\n\");\n" - "> > \302\240\t\treturn ret;\n" - "> > \302\240\t}\n" - "> > \302\240\n" + "> > ?\t\treturn ret;\n" + "> > ?\t}\n" + "> > ?\n" "> > @@ -236,7 +238,7 @@ static int bmg160_chip_init(struct bmg160_data\n" "> > *data)\n" - "> > \302\240\t\t\t\302\240\302\240\302\240BMG160_INT_MODE_LATCH_INT |\n" - "> > \302\240\t\t\t\302\240\302\240\302\240BMG160_INT_MODE_LATCH_RESET);\n" - "> > \302\240\tif (ret < 0) {\n" + "> > ?\t\t\t???BMG160_INT_MODE_LATCH_INT |\n" + "> > ?\t\t\t???BMG160_INT_MODE_LATCH_RESET);\n" + "> > ?\tif (ret < 0) {\n" "> > -\t\tdev_err(data->dev,\n" "> > +\t\tdev_err(dev,\n" - "> > \302\240\t\t\t\"Error writing reg_motion_intr\\n\");\n" - "> > \302\240\t\treturn ret;\n" - "> > \302\240\t}\n" + "> > ?\t\t\t\"Error writing reg_motion_intr\\n\");\n" + "> > ?\t\treturn ret;\n" + "> > ?\t}\n" "> > @@ -247,20 +249,21 @@ static int bmg160_chip_init(struct\n" "> > bmg160_data *data)\n" - "> > \302\240static int bmg160_set_power_state(struct bmg160_data *data, bool\n" + "> > ?static int bmg160_set_power_state(struct bmg160_data *data, bool\n" "> > on)\n" - "> > \302\240{\n" - "> > \302\240#ifdef CONFIG_PM\n" + "> > ?{\n" + "> > ?#ifdef CONFIG_PM\n" "> > +\tstruct device *dev = regmap_get_device(data->regmap);\n" - "> > \302\240\tint ret;\n" - "> > \302\240\n" - "> > \302\240\tif (on)\n" + "> > ?\tint ret;\n" + "> > ?\n" + "> > ?\tif (on)\n" "> > -\t\tret = pm_runtime_get_sync(data->dev);\n" "> > +\t\tret = pm_runtime_get_sync(dev);\n" - "> > \302\240\telse {\n" + "> > ?\telse {\n" "> > -\t\tpm_runtime_mark_last_busy(data->dev);\n" "> > -\t\tret = pm_runtime_put_autosuspend(data->dev);\n" "> > +\t\tpm_runtime_mark_last_busy(dev);\n" "> > +\t\tret = pm_runtime_put_autosuspend(dev);\n" - "> > \302\240\t}\n" - "> > \302\240\n" - "> > \302\240\tif (ret < 0) {\n" + "> > ?\t}\n" + "> > ?\n" + "> > ?\tif (ret < 0) {\n" "> > -\t\tdev_err(data->dev,\n" "> > -\t\t\t\"Failed: bmg160_set_power_state for %d\\n\",\n" "> > on);\n" "> > +\t\tdev_err(dev, \"Failed: bmg160_set_power_state for\n" "> > %d\\n\", on);\n" "> > +\n" - "> > \302\240\t\tif (on)\n" + "> > ?\t\tif (on)\n" "> > -\t\t\tpm_runtime_put_noidle(data->dev);\n" "> > +\t\t\tpm_runtime_put_noidle(dev);\n" - "> > \302\240\n" - "> > \302\240\t\treturn ret;\n" - "> > \302\240\t}\n" + "> > ?\n" + "> > ?\t\treturn ret;\n" + "> > ?\t}\n" "> > @@ -272,6 +275,7 @@ static int bmg160_set_power_state(struct\n" "> > bmg160_data *data, bool on)\n" - "> > \302\240static int bmg160_setup_any_motion_interrupt(struct bmg160_data\n" + "> > ?static int bmg160_setup_any_motion_interrupt(struct bmg160_data\n" "> > *data,\n" - "> > \302\240\t\t\t\t\t\302\240\302\240\302\240\302\240\302\240bool status)\n" - "> > \302\240{\n" + "> > ?\t\t\t\t\t?????bool status)\n" + "> > ?{\n" "> > +\tstruct device *dev = regmap_get_device(data->regmap);\n" - "> > \302\240\tint ret;\n" - "> > \302\240\n" - "> > \302\240\t/* Enable/Disable INT_MAP0 mapping */\n" + "> > ?\tint ret;\n" + "> > ?\n" + "> > ?\t/* Enable/Disable INT_MAP0 mapping */\n" "> > @@ -279,7 +283,7 @@ static int\n" "> > bmg160_setup_any_motion_interrupt(struct bmg160_data *data,\n" - "> > \302\240\t\t\t\t\302\240BMG160_INT_MAP_0_BIT_ANY,\n" - "> > \302\240\t\t\t\t\302\240(status ?\n" + "> > ?\t\t\t\t?BMG160_INT_MAP_0_BIT_ANY,\n" + "> > ?\t\t\t\t?(status ?\n" "> > BMG160_INT_MAP_0_BIT_ANY : 0));\n" - "> > \302\240\tif (ret < 0) {\n" + "> > ?\tif (ret < 0) {\n" "> > -\t\tdev_err(data->dev, \"Error updating bits\n" "> > reg_int_map0\\n\");\n" "> > +\t\tdev_err(dev, \"Error updating bits\n" "> > reg_int_map0\\n\");\n" - "> > \302\240\t\treturn ret;\n" - "> > \302\240\t}\n" - "> > \302\240\n" + "> > ?\t\treturn ret;\n" + "> > ?\t}\n" + "> > ?\n" "> > @@ -289,8 +293,7 @@ static int\n" "> > bmg160_setup_any_motion_interrupt(struct bmg160_data *data,\n" - "> > \302\240\t\tret = regmap_write(data->regmap,\n" + "> > ?\t\tret = regmap_write(data->regmap,\n" "> > BMG160_REG_SLOPE_THRES,\n" - "> > \302\240\t\t\t\t\302\240\302\240\302\240data->slope_thres);\n" - "> > \302\240\t\tif (ret < 0) {\n" + "> > ?\t\t\t\t???data->slope_thres);\n" + "> > ?\t\tif (ret < 0) {\n" "> > -\t\t\tdev_err(data->dev,\n" "> > -\t\t\t\t\"Error writing\n" "> > reg_slope_thres\\n\");\n" "> > +\t\t\tdev_err(dev, \"Error writing\n" "> > reg_slope_thres\\n\");\n" - "> > \302\240\t\t\treturn ret;\n" - "> > \302\240\t\t}\n" - "> > \302\240\n" + "> > ?\t\t\treturn ret;\n" + "> > ?\t\t}\n" + "> > ?\n" "> > @@ -298,8 +301,7 @@ static int\n" "> > bmg160_setup_any_motion_interrupt(struct bmg160_data *data,\n" - "> > \302\240\t\t\t\t\302\240\302\240\302\240BMG160_INT_MOTION_X |\n" + "> > ?\t\t\t\t???BMG160_INT_MOTION_X |\n" "> > BMG160_INT_MOTION_Y |\n" - "> > \302\240\t\t\t\t\302\240\302\240\302\240BMG160_INT_MOTION_Z);\n" - "> > \302\240\t\tif (ret < 0) {\n" + "> > ?\t\t\t\t???BMG160_INT_MOTION_Z);\n" + "> > ?\t\tif (ret < 0) {\n" "> > -\t\t\tdev_err(data->dev,\n" "> > -\t\t\t\t\"Error writing\n" "> > reg_motion_intr\\n\");\n" "> > +\t\t\tdev_err(dev, \"Error writing\n" "> > reg_motion_intr\\n\");\n" - "> > \302\240\t\t\treturn ret;\n" - "> > \302\240\t\t}\n" - "> > \302\240\n" + "> > ?\t\t\treturn ret;\n" + "> > ?\t\t}\n" + "> > ?\n" "> > @@ -314,8 +316,7 @@ static int\n" "> > bmg160_setup_any_motion_interrupt(struct bmg160_data *data,\n" - "> > \302\240\t\t\t\t\t\302\240\302\240\302\240BMG160_INT_MODE_LATCH_I\n" + "> > ?\t\t\t\t\t???BMG160_INT_MODE_LATCH_I\n" "> > NT |\n" - "> > \302\240\t\t\t\t\t\302\240\302\240\302\240BMG160_INT_MODE_LATCH_R\n" + "> > ?\t\t\t\t\t???BMG160_INT_MODE_LATCH_R\n" "> > ESET);\n" - "> > \302\240\t\t\tif (ret < 0) {\n" + "> > ?\t\t\tif (ret < 0) {\n" "> > -\t\t\t\tdev_err(data->dev,\n" "> > -\t\t\t\t\t\"Error writing\n" "> > reg_rst_latch\\n\");\n" "> > +\t\t\t\tdev_err(dev, \"Error writing\n" "> > reg_rst_latch\\n\");\n" - "> > \302\240\t\t\t\treturn ret;\n" - "> > \302\240\t\t\t}\n" - "> > \302\240\t\t}\n" + "> > ?\t\t\t\treturn ret;\n" + "> > ?\t\t\t}\n" + "> > ?\t\t}\n" "> > @@ -328,7 +329,7 @@ static int\n" "> > bmg160_setup_any_motion_interrupt(struct bmg160_data *data,\n" - "> > \302\240\t}\n" - "> > \302\240\n" - "> > \302\240\tif (ret < 0) {\n" + "> > ?\t}\n" + "> > ?\n" + "> > ?\tif (ret < 0) {\n" "> > -\t\tdev_err(data->dev, \"Error writing reg_int_en0\\n\");\n" "> > +\t\tdev_err(dev, \"Error writing reg_int_en0\\n\");\n" - "> > \302\240\t\treturn ret;\n" - "> > \302\240\t}\n" - "> > \302\240\n" + "> > ?\t\treturn ret;\n" + "> > ?\t}\n" + "> > ?\n" "> > @@ -338,6 +339,7 @@ static int\n" "> > bmg160_setup_any_motion_interrupt(struct bmg160_data *data,\n" - "> > \302\240static int bmg160_setup_new_data_interrupt(struct bmg160_data\n" + "> > ?static int bmg160_setup_new_data_interrupt(struct bmg160_data\n" "> > *data,\n" - "> > \302\240\t\t\t\t\t\302\240\302\240\302\240bool status)\n" - "> > \302\240{\n" + "> > ?\t\t\t\t\t???bool status)\n" + "> > ?{\n" "> > +\tstruct device *dev = regmap_get_device(data->regmap);\n" - "> > \302\240\tint ret;\n" - "> > \302\240\n" - "> > \302\240\t/* Enable/Disable INT_MAP1 mapping */\n" + "> > ?\tint ret;\n" + "> > ?\n" + "> > ?\t/* Enable/Disable INT_MAP1 mapping */\n" "> > @@ -345,7 +347,7 @@ static int\n" "> > bmg160_setup_new_data_interrupt(struct bmg160_data *data,\n" - "> > \302\240\t\t\t\t\302\240BMG160_INT_MAP_1_BIT_NEW_DATA,\n" - "> > \302\240\t\t\t\t\302\240(status ?\n" + "> > ?\t\t\t\t?BMG160_INT_MAP_1_BIT_NEW_DATA,\n" + "> > ?\t\t\t\t?(status ?\n" "> > BMG160_INT_MAP_1_BIT_NEW_DATA : 0));\n" - "> > \302\240\tif (ret < 0) {\n" + "> > ?\tif (ret < 0) {\n" "> > -\t\tdev_err(data->dev, \"Error updating bits in\n" "> > reg_int_map1\\n\");\n" "> > +\t\tdev_err(dev, \"Error updating bits in\n" "> > reg_int_map1\\n\");\n" - "> > \302\240\t\treturn ret;\n" - "> > \302\240\t}\n" - "> > \302\240\n" + "> > ?\t\treturn ret;\n" + "> > ?\t}\n" + "> > ?\n" "> > @@ -354,9 +356,8 @@ static int\n" "> > bmg160_setup_new_data_interrupt(struct bmg160_data *data,\n" - "> > \302\240\t\t\t\t\302\240\302\240\302\240BMG160_INT_MODE_NON_LATCH_INT |\n" - "> > \302\240\t\t\t\t\302\240\302\240\302\240BMG160_INT_MODE_LATCH_RESET);\n" - "> > \302\240\t\tif (ret < 0) {\n" + "> > ?\t\t\t\t???BMG160_INT_MODE_NON_LATCH_INT |\n" + "> > ?\t\t\t\t???BMG160_INT_MODE_LATCH_RESET);\n" + "> > ?\t\tif (ret < 0) {\n" "> > -\t\t\tdev_err(data->dev,\n" "> > -\t\t\t\t\"Error writing reg_rst_latch\\n\");\n" "> > -\t\t\t\treturn ret;\n" "> > +\t\t\tdev_err(dev, \"Error writing\n" "> > reg_rst_latch\\n\");\n" "> > +\t\t\treturn ret;\n" - "> > \302\240\t\t}\n" - "> > \302\240\n" - "> > \302\240\t\tret = regmap_write(data->regmap,\n" + "> > ?\t\t}\n" + "> > ?\n" + "> > ?\t\tret = regmap_write(data->regmap,\n" "> > BMG160_REG_INT_EN_0,\n" "> > @@ -368,16 +369,15 @@ static int\n" "> > bmg160_setup_new_data_interrupt(struct bmg160_data *data,\n" - "> > \302\240\t\t\t\t\302\240\302\240\302\240BMG160_INT_MODE_LATCH_INT |\n" - "> > \302\240\t\t\t\t\302\240\302\240\302\240BMG160_INT_MODE_LATCH_RESET);\n" - "> > \302\240\t\tif (ret < 0) {\n" + "> > ?\t\t\t\t???BMG160_INT_MODE_LATCH_INT |\n" + "> > ?\t\t\t\t???BMG160_INT_MODE_LATCH_RESET);\n" + "> > ?\t\tif (ret < 0) {\n" "> > -\t\t\tdev_err(data->dev,\n" "> > -\t\t\t\t\"Error writing reg_rst_latch\\n\");\n" "> > -\t\t\t\treturn ret;\n" "> > +\t\t\tdev_err(dev, \"Error writing\n" "> > reg_rst_latch\\n\");\n" "> > +\t\t\treturn ret;\n" - "> > \302\240\t\t}\n" - "> > \302\240\n" - "> > \302\240\t\tret = regmap_write(data->regmap,\n" + "> > ?\t\t}\n" + "> > ?\n" + "> > ?\t\tret = regmap_write(data->regmap,\n" "> > BMG160_REG_INT_EN_0, 0);\n" - "> > \302\240\t}\n" - "> > \302\240\n" - "> > \302\240\tif (ret < 0) {\n" + "> > ?\t}\n" + "> > ?\n" + "> > ?\tif (ret < 0) {\n" "> > -\t\tdev_err(data->dev, \"Error writing reg_int_en0\\n\");\n" "> > +\t\tdev_err(dev, \"Error writing reg_int_en0\\n\");\n" - "> > \302\240\t\treturn ret;\n" - "> > \302\240\t}\n" - "> > \302\240\n" + "> > ?\t\treturn ret;\n" + "> > ?\t}\n" + "> > ?\n" "> > @@ -400,6 +400,7 @@ static int bmg160_get_bw(struct bmg160_data\n" "> > *data, int *val)\n" - "> > \302\240\n" - "> > \302\240static int bmg160_set_scale(struct bmg160_data *data, int val)\n" - "> > \302\240{\n" + "> > ?\n" + "> > ?static int bmg160_set_scale(struct bmg160_data *data, int val)\n" + "> > ?{\n" "> > +\tstruct device *dev = regmap_get_device(data->regmap);\n" - "> > \302\240\tint ret, i;\n" - "> > \302\240\n" - "> > \302\240\tfor (i = 0; i < ARRAY_SIZE(bmg160_scale_table); ++i) {\n" + "> > ?\tint ret, i;\n" + "> > ?\n" + "> > ?\tfor (i = 0; i < ARRAY_SIZE(bmg160_scale_table); ++i) {\n" "> > @@ -407,8 +408,7 @@ static int bmg160_set_scale(struct bmg160_data\n" "> > *data, int val)\n" - "> > \302\240\t\t\tret = regmap_write(data->regmap,\n" + "> > ?\t\t\tret = regmap_write(data->regmap,\n" "> > BMG160_REG_RANGE,\n" - "> > \302\240\t\t\t\t\t\302\240\302\240\302\240bmg160_scale_table[i].d\n" + "> > ?\t\t\t\t\t???bmg160_scale_table[i].d\n" "> > ps_range);\n" - "> > \302\240\t\t\tif (ret < 0) {\n" + "> > ?\t\t\tif (ret < 0) {\n" "> > -\t\t\t\tdev_err(data->dev,\n" "> > -\t\t\t\t\t\"Error writing\n" "> > reg_range\\n\");\n" "> > +\t\t\t\tdev_err(dev, \"Error writing\n" "> > reg_range\\n\");\n" - "> > \302\240\t\t\t\treturn ret;\n" - "> > \302\240\t\t\t}\n" - "> > \302\240\t\t\tdata->dps_range =\n" + "> > ?\t\t\t\treturn ret;\n" + "> > ?\t\t\t}\n" + "> > ?\t\t\tdata->dps_range =\n" "> > bmg160_scale_table[i].dps_range;\n" "> > @@ -421,6 +421,7 @@ static int bmg160_set_scale(struct bmg160_data\n" "> > *data, int val)\n" - "> > \302\240\n" - "> > \302\240static int bmg160_get_temp(struct bmg160_data *data, int *val)\n" - "> > \302\240{\n" + "> > ?\n" + "> > ?static int bmg160_get_temp(struct bmg160_data *data, int *val)\n" + "> > ?{\n" "> > +\tstruct device *dev = regmap_get_device(data->regmap);\n" - "> > \302\240\tint ret;\n" - "> > \302\240\tunsigned int raw_val;\n" - "> > \302\240\n" + "> > ?\tint ret;\n" + "> > ?\tunsigned int raw_val;\n" + "> > ?\n" "> > @@ -433,7 +434,7 @@ static int bmg160_get_temp(struct bmg160_data\n" "> > *data, int *val)\n" - "> > \302\240\n" - "> > \302\240\tret = regmap_read(data->regmap, BMG160_REG_TEMP,\n" + "> > ?\n" + "> > ?\tret = regmap_read(data->regmap, BMG160_REG_TEMP,\n" "> > &raw_val);\n" - "> > \302\240\tif (ret < 0) {\n" + "> > ?\tif (ret < 0) {\n" "> > -\t\tdev_err(data->dev, \"Error reading reg_temp\\n\");\n" "> > +\t\tdev_err(dev, \"Error reading reg_temp\\n\");\n" - "> > \302\240\t\tbmg160_set_power_state(data, false);\n" - "> > \302\240\t\tmutex_unlock(&data->mutex);\n" - "> > \302\240\t\treturn ret;\n" + "> > ?\t\tbmg160_set_power_state(data, false);\n" + "> > ?\t\tmutex_unlock(&data->mutex);\n" + "> > ?\t\treturn ret;\n" "> > @@ -450,6 +451,7 @@ static int bmg160_get_temp(struct bmg160_data\n" "> > *data, int *val)\n" - "> > \302\240\n" - "> > \302\240static int bmg160_get_axis(struct bmg160_data *data, int axis, int\n" + "> > ?\n" + "> > ?static int bmg160_get_axis(struct bmg160_data *data, int axis, int\n" "> > *val)\n" - "> > \302\240{\n" + "> > ?{\n" "> > +\tstruct device *dev = regmap_get_device(data->regmap);\n" - "> > \302\240\tint ret;\n" - "> > \302\240\tunsigned int raw_val;\n" - "> > \302\240\n" + "> > ?\tint ret;\n" + "> > ?\tunsigned int raw_val;\n" + "> > ?\n" "> > @@ -463,7 +465,7 @@ static int bmg160_get_axis(struct bmg160_data\n" "> > *data, int axis, int *val)\n" - "> > \302\240\tret = regmap_bulk_read(data->regmap,\n" + "> > ?\tret = regmap_bulk_read(data->regmap,\n" "> > BMG160_AXIS_TO_REG(axis), &raw_val,\n" - "> > \302\240\t\t\t\302\240\302\240\302\240\302\240\302\240\302\240\302\2402);\n" - "> > \302\240\tif (ret < 0) {\n" + "> > ?\t\t\t???????2);\n" + "> > ?\tif (ret < 0) {\n" "> > -\t\tdev_err(data->dev, \"Error reading axis %d\\n\",\n" "> > axis);\n" "> > +\t\tdev_err(dev, \"Error reading axis %d\\n\", axis);\n" - "> > \302\240\t\tbmg160_set_power_state(data, false);\n" - "> > \302\240\t\tmutex_unlock(&data->mutex);\n" - "> > \302\240\t\treturn ret;\n" + "> > ?\t\tbmg160_set_power_state(data, false);\n" + "> > ?\t\tmutex_unlock(&data->mutex);\n" + "> > ?\t\treturn ret;\n" "> > @@ -793,6 +795,7 @@ static int bmg160_trig_try_reen(struct\n" "> > iio_trigger *trig)\n" - "> > \302\240{\n" - "> > \302\240\tstruct iio_dev *indio_dev = iio_trigger_get_drvdata(trig);\n" - "> > \302\240\tstruct bmg160_data *data = iio_priv(indio_dev);\n" + "> > ?{\n" + "> > ?\tstruct iio_dev *indio_dev = iio_trigger_get_drvdata(trig);\n" + "> > ?\tstruct bmg160_data *data = iio_priv(indio_dev);\n" "> > +\tstruct device *dev = regmap_get_device(data->regmap);\n" - "> > \302\240\tint ret;\n" - "> > \302\240\n" - "> > \302\240\t/* new data interrupts don't need ack */\n" + "> > ?\tint ret;\n" + "> > ?\n" + "> > ?\t/* new data interrupts don't need ack */\n" "> > @@ -804,7 +807,7 @@ static int bmg160_trig_try_reen(struct\n" "> > iio_trigger *trig)\n" - "> > \302\240\t\t\t\302\240\302\240\302\240BMG160_INT_MODE_LATCH_INT |\n" - "> > \302\240\t\t\t\302\240\302\240\302\240BMG160_INT_MODE_LATCH_RESET);\n" - "> > \302\240\tif (ret < 0) {\n" + "> > ?\t\t\t???BMG160_INT_MODE_LATCH_INT |\n" + "> > ?\t\t\t???BMG160_INT_MODE_LATCH_RESET);\n" + "> > ?\tif (ret < 0) {\n" "> > -\t\tdev_err(data->dev, \"Error writing\n" "> > reg_rst_latch\\n\");\n" "> > +\t\tdev_err(dev, \"Error writing reg_rst_latch\\n\");\n" - "> > \302\240\t\treturn ret;\n" - "> > \302\240\t}\n" - "> > \302\240\n" + "> > ?\t\treturn ret;\n" + "> > ?\t}\n" + "> > ?\n" "> > @@ -864,13 +867,14 @@ static irqreturn_t bmg160_event_handler(int\n" "> > irq, void *private)\n" - "> > \302\240{\n" - "> > \302\240\tstruct iio_dev *indio_dev = private;\n" - "> > \302\240\tstruct bmg160_data *data = iio_priv(indio_dev);\n" + "> > ?{\n" + "> > ?\tstruct iio_dev *indio_dev = private;\n" + "> > ?\tstruct bmg160_data *data = iio_priv(indio_dev);\n" "> > +\tstruct device *dev = regmap_get_device(data->regmap);\n" - "> > \302\240\tint ret;\n" - "> > \302\240\tint dir;\n" - "> > \302\240\tunsigned int val;\n" - "> > \302\240\n" - "> > \302\240\tret = regmap_read(data->regmap, BMG160_REG_INT_STATUS_2,\n" + "> > ?\tint ret;\n" + "> > ?\tint dir;\n" + "> > ?\tunsigned int val;\n" + "> > ?\n" + "> > ?\tret = regmap_read(data->regmap, BMG160_REG_INT_STATUS_2,\n" "> > &val);\n" - "> > \302\240\tif (ret < 0) {\n" + "> > ?\tif (ret < 0) {\n" "> > -\t\tdev_err(data->dev, \"Error reading\n" "> > reg_int_status2\\n\");\n" "> > +\t\tdev_err(dev, \"Error reading reg_int_status2\\n\");\n" - "> > \302\240\t\tgoto ack_intr_status;\n" - "> > \302\240\t}\n" - "> > \302\240\n" + "> > ?\t\tgoto ack_intr_status;\n" + "> > ?\t}\n" + "> > ?\n" "> > @@ -907,8 +911,7 @@ ack_intr_status:\n" - "> > \302\240\t\t\t\t\302\240\302\240\302\240BMG160_INT_MODE_LATCH_INT |\n" - "> > \302\240\t\t\t\t\302\240\302\240\302\240BMG160_INT_MODE_LATCH_RESET);\n" - "> > \302\240\t\tif (ret < 0)\n" + "> > ?\t\t\t\t???BMG160_INT_MODE_LATCH_INT |\n" + "> > ?\t\t\t\t???BMG160_INT_MODE_LATCH_RESET);\n" + "> > ?\t\tif (ret < 0)\n" "> > -\t\t\tdev_err(data->dev,\n" "> > -\t\t\t\t\"Error writing reg_rst_latch\\n\");\n" "> > +\t\t\tdev_err(dev, \"Error writing\n" "> > reg_rst_latch\\n\");\n" - "> > \302\240\t}\n" - "> > \302\240\n" - "> > \302\240\treturn IRQ_HANDLED;\n" + "> > ?\t}\n" + "> > ?\n" + "> > ?\treturn IRQ_HANDLED;\n" "> > @@ -976,7 +979,6 @@ int bmg160_core_probe(struct device *dev,\n" "> > struct regmap *regmap, int irq,\n" - "> > \302\240\n" - "> > \302\240\tdata = iio_priv(indio_dev);\n" - "> > \302\240\tdev_set_drvdata(dev, indio_dev);\n" + "> > ?\n" + "> > ?\tdata = iio_priv(indio_dev);\n" + "> > ?\tdev_set_drvdata(dev, indio_dev);\n" "> > -\tdata->dev = dev;\n" - "> > \302\240\tdata->irq = irq;\n" - "> > \302\240\tdata->regmap = regmap;\n" - "> > \302\240\n" + "> > ?\tdata->irq = irq;\n" + "> > ?\tdata->regmap = regmap;\n" + "> > ?\n" "> > @@ -1139,7 +1141,7 @@ static int bmg160_runtime_suspend(struct\n" "> > device *dev)\n" - "> > \302\240\n" - "> > \302\240\tret = bmg160_set_mode(data, BMG160_MODE_SUSPEND);\n" - "> > \302\240\tif (ret < 0) {\n" + "> > ?\n" + "> > ?\tret = bmg160_set_mode(data, BMG160_MODE_SUSPEND);\n" + "> > ?\tif (ret < 0) {\n" "> > -\t\tdev_err(data->dev, \"set mode failed\\n\");\n" "> > +\t\tdev_err(dev, \"set mode failed\\n\");\n" - "> > \302\240\t\treturn -EAGAIN;\n" - "> > \302\240\t}\n" - "> > \302\240\n" + "> > ?\t\treturn -EAGAIN;\n" + "> > ?\t}\n" + "> > ?\n" > > -3e004fde518eeda12075e5a558c00b6a714e0d23b1d886eff83b8d0e583f79bf +91de1be6ea6a94817f8b5606d8ad614ebe64a85fa065ac9f167db0f33f6f0881
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.