diff mbox

[4/5] iio: accel: bcm150: Remove handling for regmap raw_read_max

Message ID 20180215175220.2691-4-ckeepax@opensource.cirrus.com (mailing list archive)
State New, archived
Headers show

Commit Message

Charles Keepax Feb. 15, 2018, 5:52 p.m. UTC
The regmap core now handles splitting up transactions according to
max_raw_read, so this code is no longer required in client drivers.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
---
 drivers/iio/accel/bmc150-accel-core.c | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

Comments

Jonathan Cameron Feb. 17, 2018, 2:09 p.m. UTC | #1
On Thu, 15 Feb 2018 17:52:19 +0000
Charles Keepax <ckeepax@opensource.cirrus.com> wrote:

> The regmap core now handles splitting up transactions according to
> max_raw_read, so this code is no longer required in client drivers.
> 
> Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Hi Charles,

This looks fine to me.  I'll need to wait for Mark's patches to work
their way through to mainline before I can apply this however.

Please give me a poke when that has happened if it looks like I have
forgotten it.

Thanks,

Jonathan

> ---
>  drivers/iio/accel/bmc150-accel-core.c | 23 +++--------------------
>  1 file changed, 3 insertions(+), 20 deletions(-)
> 
> diff --git a/drivers/iio/accel/bmc150-accel-core.c b/drivers/iio/accel/bmc150-accel-core.c
> index 870f92ef61c2..3d2e6b501bf9 100644
> --- a/drivers/iio/accel/bmc150-accel-core.c
> +++ b/drivers/iio/accel/bmc150-accel-core.c
> @@ -838,29 +838,12 @@ static int bmc150_accel_fifo_transfer(struct bmc150_accel_data *data,
>  	int sample_length = 3 * 2;
>  	int ret;
>  	int total_length = samples * sample_length;
> -	int i;
> -	size_t step = regmap_get_raw_read_max(data->regmap);
> -
> -	if (!step || step > total_length)
> -		step = total_length;
> -	else if (step < total_length)
> -		step = sample_length;
> -
> -	/*
> -	 * Seems we have a bus with size limitation so we have to execute
> -	 * multiple reads
> -	 */
> -	for (i = 0; i < total_length; i += step) {
> -		ret = regmap_raw_read(data->regmap, BMC150_ACCEL_REG_FIFO_DATA,
> -				      &buffer[i], step);
> -		if (ret)
> -			break;
> -	}
>  
> +	ret = regmap_raw_read(data->regmap, BMC150_ACCEL_REG_FIFO_DATA,
> +			      buffer, total_length);
>  	if (ret)
>  		dev_err(dev,
> -			"Error transferring data from fifo in single steps of %zu\n",
> -			step);
> +			"Error transferring data from fifo: %d\n", ret);
>  
>  	return ret;
>  }

--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Charles Keepax Feb. 19, 2018, 11:42 a.m. UTC | #2
On Sat, Feb 17, 2018 at 02:09:35PM +0000, Jonathan Cameron wrote:
> On Thu, 15 Feb 2018 17:52:19 +0000
> Charles Keepax <ckeepax@opensource.cirrus.com> wrote:
> 
> > The regmap core now handles splitting up transactions according to
> > max_raw_read, so this code is no longer required in client drivers.
> > 
> > Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
> Hi Charles,
> 
> This looks fine to me.  I'll need to wait for Mark's patches to work
> their way through to mainline before I can apply this however.
> 
> Please give me a poke when that has happened if it looks like I have
> forgotten it.
> 

Yeah can do.

Thanks,
Charles
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/iio/accel/bmc150-accel-core.c b/drivers/iio/accel/bmc150-accel-core.c
index 870f92ef61c2..3d2e6b501bf9 100644
--- a/drivers/iio/accel/bmc150-accel-core.c
+++ b/drivers/iio/accel/bmc150-accel-core.c
@@ -838,29 +838,12 @@  static int bmc150_accel_fifo_transfer(struct bmc150_accel_data *data,
 	int sample_length = 3 * 2;
 	int ret;
 	int total_length = samples * sample_length;
-	int i;
-	size_t step = regmap_get_raw_read_max(data->regmap);
-
-	if (!step || step > total_length)
-		step = total_length;
-	else if (step < total_length)
-		step = sample_length;
-
-	/*
-	 * Seems we have a bus with size limitation so we have to execute
-	 * multiple reads
-	 */
-	for (i = 0; i < total_length; i += step) {
-		ret = regmap_raw_read(data->regmap, BMC150_ACCEL_REG_FIFO_DATA,
-				      &buffer[i], step);
-		if (ret)
-			break;
-	}
 
+	ret = regmap_raw_read(data->regmap, BMC150_ACCEL_REG_FIFO_DATA,
+			      buffer, total_length);
 	if (ret)
 		dev_err(dev,
-			"Error transferring data from fifo in single steps of %zu\n",
-			step);
+			"Error transferring data from fifo: %d\n", ret);
 
 	return ret;
 }