All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2] iio: accell: mma8452: Reduce sleep time when data not ready
@ 2018-05-07  3:51 Richard Tresidder
  2018-05-07  4:13 ` Richard Tresidder
  0 siblings, 1 reply; 8+ messages in thread
From: Richard Tresidder @ 2018-05-07  3:51 UTC (permalink / raw)
  To: linux-iio; +Cc: Jonathan Cameron, knaack.h, lars, pmeerw, harinath922, martink

[-- Attachment #1: Type: text/html, Size: 2516 bytes --]

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH v2] iio: accell: mma8452: Reduce sleep time when data not ready
  2018-05-07  3:51 [PATCH v2] iio: accell: mma8452: Reduce sleep time when data not ready Richard Tresidder
@ 2018-05-07  4:13 ` Richard Tresidder
  2018-05-07  7:49   ` Martin Kepplinger
  0 siblings, 1 reply; 8+ messages in thread
From: Richard Tresidder @ 2018-05-07  4:13 UTC (permalink / raw)
  To: linux-iio; +Cc: Jonathan Cameron, knaack.h, lars, pmeerw, harinath922, martink

Modified the sleep method when data is not ready to allow for sampling > 50sps to work.
Fix Fallthru warning in case statement

Signed-off-by: Richard Tresidder <rtresidd@electromag.com.au>
--
diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c
index 7a2da7f..948740d 100644
--- a/drivers/iio/accel/mma8452.c
+++ b/drivers/iio/accel/mma8452.c
@@ -106,6 +106,7 @@ struct mma8452_data {
 	u8 ctrl_reg1;
 	u8 data_cfg;
 	const struct mma_chip_info *chip_info;
+	int sleep_val;
 };
 
  /**
@@ -193,7 +194,10 @@ static int mma8452_drdy(struct mma8452_data *data)
 		if ((ret & MMA8452_STATUS_DRDY) == MMA8452_STATUS_DRDY)
 			return 0;
 
-		msleep(20);
+		if (data->sleep_val <= 20)
+			usleep_range(data->sleep_val * 250, data->sleep_val * 500);
+		else
+			msleep(20);
 	}
 
 	dev_err(&data->client->dev, "data not ready\n");
@@ -544,6 +548,18 @@ static int mma8452_read_raw(struct iio_dev *indio_dev,
 	return -EINVAL;
 }
 
+static int mma8452_calculate_sleep(struct mma8452_data *data)
+{
+	int ret, i = mma8452_get_odr_index(data);
+	
+	if (mma8452_samp_freq[i][0] > 0)
+		ret = 1000 / mma8452_samp_freq[i][0];
+	else 
+		ret = 1000;
+
+	return ret == 0 ? 1 : ret;
+}
+
 static int mma8452_standby(struct mma8452_data *data)
 {
 	return i2c_smbus_write_byte_data(data->client, MMA8452_CTRL_REG1,
@@ -700,6 +716,8 @@ static int mma8452_write_raw(struct iio_dev *indio_dev,
 		data->ctrl_reg1 &= ~MMA8452_CTRL_DR_MASK;
 		data->ctrl_reg1 |= i << MMA8452_CTRL_DR_SHIFT;
 
+		data->sleep_val = mma8452_calculate_sleep(data);
+
 		ret = mma8452_change_config(data, MMA8452_CTRL_REG1,
 					    data->ctrl_reg1);
 		break;
@@ -1528,6 +1546,7 @@ static int mma8452_probe(struct i2c_client *client,
 	case FXLS8471_DEVICE_ID:
 		if (ret == data->chip_info->chip_id)
 			break;
+		/* FALLTHRU */
 	default:
 		return -ENODEV;
 	}
@@ -1593,6 +1612,9 @@ static int mma8452_probe(struct i2c_client *client,
 
 	data->ctrl_reg1 = MMA8452_CTRL_ACTIVE |
 			  (MMA8452_CTRL_DR_DEFAULT << MMA8452_CTRL_DR_SHIFT);
+				
+	data->sleep_val = mma8452_calculate_sleep(data);
+
 	ret = i2c_smbus_write_byte_data(client, MMA8452_CTRL_REG1,
 					data->ctrl_reg1);
 	if (ret < 0)


^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH v2] iio: accell: mma8452: Reduce sleep time when data not ready
  2018-05-07  4:13 ` Richard Tresidder
@ 2018-05-07  7:49   ` Martin Kepplinger
  2018-05-07  7:59     ` Richard Tresidder
  0 siblings, 1 reply; 8+ messages in thread
From: Martin Kepplinger @ 2018-05-07  7:49 UTC (permalink / raw)
  To: Richard Tresidder, linux-iio
  Cc: Jonathan Cameron, knaack.h, lars, pmeerw, harinath922

On 2018-05-07 06:13, Richard Tresidder wrote:
> Modified the sleep method when data is not ready to allow for sampling > 50sps to work.
> Fix Fallthru warning in case statement
> 
> Signed-off-by: Richard Tresidder <rtresidd@electromag.com.au>
> --
> diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c
> index 7a2da7f..948740d 100644
> --- a/drivers/iio/accel/mma8452.c
> +++ b/drivers/iio/accel/mma8452.c
> @@ -106,6 +106,7 @@ struct mma8452_data {
>   	u8 ctrl_reg1;
>   	u8 data_cfg;
>   	const struct mma_chip_info *chip_info;
> +	int sleep_val;
>   };
>   
>    /**
> @@ -193,7 +194,10 @@ static int mma8452_drdy(struct mma8452_data *data)
>   		if ((ret & MMA8452_STATUS_DRDY) == MMA8452_STATUS_DRDY)
>   			return 0;
>   
> -		msleep(20);
> +		if (data->sleep_val <= 20)
> +			usleep_range(data->sleep_val * 250, data->sleep_val * 500);
> +		else
> +			msleep(20);
>   	}
>   
>   	dev_err(&data->client->dev, "data not ready\n");
> @@ -544,6 +548,18 @@ static int mma8452_read_raw(struct iio_dev *indio_dev,
>   	return -EINVAL;
>   }
>   
> +static int mma8452_calculate_sleep(struct mma8452_data *data)
> +{
> +	int ret, i = mma8452_get_odr_index(data);
> +	
> +	if (mma8452_samp_freq[i][0] > 0)
> +		ret = 1000 / mma8452_samp_freq[i][0];
> +	else
> +		ret = 1000;
> +
> +	return ret == 0 ? 1 : ret;
> +}
> +
>   static int mma8452_standby(struct mma8452_data *data)
>   {
>   	return i2c_smbus_write_byte_data(data->client, MMA8452_CTRL_REG1,
> @@ -700,6 +716,8 @@ static int mma8452_write_raw(struct iio_dev *indio_dev,
>   		data->ctrl_reg1 &= ~MMA8452_CTRL_DR_MASK;
>   		data->ctrl_reg1 |= i << MMA8452_CTRL_DR_SHIFT;
>   
> +		data->sleep_val = mma8452_calculate_sleep(data);
> +
>   		ret = mma8452_change_config(data, MMA8452_CTRL_REG1,
>   					    data->ctrl_reg1);
>   		break;
> @@ -1528,6 +1546,7 @@ static int mma8452_probe(struct i2c_client *client,
>   	case FXLS8471_DEVICE_ID:
>   		if (ret == data->chip_info->chip_id)
>   			break;
> +		/* FALLTHRU */

Please do this in a seperate patch.

>   	default:
>   		return -ENODEV;
>   	}
> @@ -1593,6 +1612,9 @@ static int mma8452_probe(struct i2c_client *client,
>   
>   	data->ctrl_reg1 = MMA8452_CTRL_ACTIVE |
>   			  (MMA8452_CTRL_DR_DEFAULT << MMA8452_CTRL_DR_SHIFT);
> +				
> +	data->sleep_val = mma8452_calculate_sleep(data);
> +
>   	ret = i2c_smbus_write_byte_data(client, MMA8452_CTRL_REG1,
>   					data->ctrl_reg1);
>   	if (ret < 0)
> 

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v2] iio: accell: mma8452: Reduce sleep time when data not ready
  2018-05-07  7:49   ` Martin Kepplinger
@ 2018-05-07  7:59     ` Richard Tresidder
  2018-05-07  8:11       ` Martin Kepplinger
  0 siblings, 1 reply; 8+ messages in thread
From: Richard Tresidder @ 2018-05-07  7:59 UTC (permalink / raw)
  To: Martin Kepplinger, linux-iio
  Cc: Jonathan Cameron, knaack.h, lars, pmeerw, harinath922

Hi Martin
   Thanks, I'll remove that /*FALLTHRU*/ compiler "disable warning" comment
I assume it is the correct comment to use to shut the compiler up?
I've also fixed up a couple of whitespace issues that checkpatch pulled me up on.
Hard to know when to merge something or not.. seen that one merged in a few times in logs..

Regards
   Richard

On 7/05/2018 3:49 PM, Martin Kepplinger wrote:

> On 2018-05-07 06:13, Richard Tresidder wrote:
>> Modified the sleep method when data is not ready to allow for sampling > 50sps to work.
>> Fix Fallthru warning in case statement
>> Signed-off-by: Richard Tresidder <rtresidd@electromag.com.au>
>> --
>> diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c
>> index 7a2da7f..948740d 100644
>> --- a/drivers/iio/accel/mma8452.c
>> +++ b/drivers/iio/accel/mma8452.c
>> @@ -106,6 +106,7 @@ struct mma8452_data {
>>       u8 ctrl_reg1;
>>       u8 data_cfg;
>>       const struct mma_chip_info *chip_info;
>> +    int sleep_val;
>>   };
>>   
>>    /**
>> @@ -193,7 +194,10 @@ static int mma8452_drdy(struct mma8452_data *data)
>>           if ((ret & MMA8452_STATUS_DRDY) == MMA8452_STATUS_DRDY)
>>               return 0;
>>   
>> -        msleep(20);
>> +        if (data->sleep_val <= 20)
>> +            usleep_range(data->sleep_val * 250, data->sleep_val * 500);
>> +        else
>> +            msleep(20);
>>       }
>>   
>>       dev_err(&data->client->dev, "data not ready\n");
>> @@ -544,6 +548,18 @@ static int mma8452_read_raw(struct iio_dev *indio_dev,
>>       return -EINVAL;
>>   }
>>   
>> +static int mma8452_calculate_sleep(struct mma8452_data *data)
>> +{
>> +    int ret, i = mma8452_get_odr_index(data);
>> +    
>> +    if (mma8452_samp_freq[i][0] > 0)
>> +        ret = 1000 / mma8452_samp_freq[i][0];
>> +    else
>> +        ret = 1000;
>> +
>> +    return ret == 0 ? 1 : ret;
>> +}
>> +
>>   static int mma8452_standby(struct mma8452_data *data)
>>   {
>>       return i2c_smbus_write_byte_data(data->client, MMA8452_CTRL_REG1,
>> @@ -700,6 +716,8 @@ static int mma8452_write_raw(struct iio_dev *indio_dev,
>>           data->ctrl_reg1 &= ~MMA8452_CTRL_DR_MASK;
>>           data->ctrl_reg1 |= i << MMA8452_CTRL_DR_SHIFT;
>>   
>> +        data->sleep_val = mma8452_calculate_sleep(data);
>> +
>>           ret = mma8452_change_config(data, MMA8452_CTRL_REG1,
>>                           data->ctrl_reg1);
>>           break;
>> @@ -1528,6 +1546,7 @@ static int mma8452_probe(struct i2c_client *client,
>>       case FXLS8471_DEVICE_ID:
>>           if (ret == data->chip_info->chip_id)
>>               break;
>> +        /* FALLTHRU */
> Please do this in a seperate patch.
>>       default:
>>           return -ENODEV;
>>       }
>> @@ -1593,6 +1612,9 @@ static int mma8452_probe(struct i2c_client *client,
>>   
>>       data->ctrl_reg1 = MMA8452_CTRL_ACTIVE |
>>                 (MMA8452_CTRL_DR_DEFAULT << MMA8452_CTRL_DR_SHIFT);
>> +                
>> +    data->sleep_val = mma8452_calculate_sleep(data);
>> +
>>       ret = i2c_smbus_write_byte_data(client, MMA8452_CTRL_REG1,
>>                       data->ctrl_reg1);
>>       if (ret < 0)
> --
> 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
>

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v2] iio: accell: mma8452: Reduce sleep time when data not ready
  2018-05-07  7:59     ` Richard Tresidder
@ 2018-05-07  8:11       ` Martin Kepplinger
  2018-05-08  8:19         ` [PATCH v3] " Richard Tresidder
  0 siblings, 1 reply; 8+ messages in thread
From: Martin Kepplinger @ 2018-05-07  8:11 UTC (permalink / raw)
  To: Richard Tresidder, linux-iio
  Cc: Jonathan Cameron, knaack.h, lars, pmeerw, harinath922

On 2018-05-07 09:59, Richard Tresidder wrote:
> Hi Martin
>     Thanks, I'll remove that /*FALLTHRU*/ compiler "disable warning" comment > I assume it is the correct comment to use to shut the compiler up?

Please use /* fallthrough */ instead.

> I've also fixed up a couple of whitespace issues that checkpatch pulled me up on.
> Hard to know when to merge something or not.. seen that one merged in a few times in logs..

just like the fallthrough marker, make it a follow-up patch to your 
change (the sleep fix).

> 
> Regards
>     Richard
> 
> On 7/05/2018 3:49 PM, Martin Kepplinger wrote:
> 
>> On 2018-05-07 06:13, Richard Tresidder wrote:
>>> Modified the sleep method when data is not ready to allow for sampling > 50sps to work.
>>> Fix Fallthru warning in case statement
>>> Signed-off-by: Richard Tresidder <rtresidd@electromag.com.au>
>>> --
>>> diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c
>>> index 7a2da7f..948740d 100644
>>> --- a/drivers/iio/accel/mma8452.c
>>> +++ b/drivers/iio/accel/mma8452.c
>>> @@ -106,6 +106,7 @@ struct mma8452_data {
>>>        u8 ctrl_reg1;
>>>        u8 data_cfg;
>>>        const struct mma_chip_info *chip_info;
>>> +    int sleep_val;
>>>    };
>>>    
>>>     /**
>>> @@ -193,7 +194,10 @@ static int mma8452_drdy(struct mma8452_data *data)
>>>            if ((ret & MMA8452_STATUS_DRDY) == MMA8452_STATUS_DRDY)
>>>                return 0;
>>>    
>>> -        msleep(20);
>>> +        if (data->sleep_val <= 20)
>>> +            usleep_range(data->sleep_val * 250, data->sleep_val * 500);
>>> +        else
>>> +            msleep(20);
>>>        }
>>>    
>>>        dev_err(&data->client->dev, "data not ready\n");
>>> @@ -544,6 +548,18 @@ static int mma8452_read_raw(struct iio_dev *indio_dev,
>>>        return -EINVAL;
>>>    }
>>>    
>>> +static int mma8452_calculate_sleep(struct mma8452_data *data)
>>> +{
>>> +    int ret, i = mma8452_get_odr_index(data);
>>> +
>>> +    if (mma8452_samp_freq[i][0] > 0)
>>> +        ret = 1000 / mma8452_samp_freq[i][0];
>>> +    else
>>> +        ret = 1000;
>>> +
>>> +    return ret == 0 ? 1 : ret;
>>> +}
>>> +
>>>    static int mma8452_standby(struct mma8452_data *data)
>>>    {
>>>        return i2c_smbus_write_byte_data(data->client, MMA8452_CTRL_REG1,
>>> @@ -700,6 +716,8 @@ static int mma8452_write_raw(struct iio_dev *indio_dev,
>>>            data->ctrl_reg1 &= ~MMA8452_CTRL_DR_MASK;
>>>            data->ctrl_reg1 |= i << MMA8452_CTRL_DR_SHIFT;
>>>    
>>> +        data->sleep_val = mma8452_calculate_sleep(data);
>>> +
>>>            ret = mma8452_change_config(data, MMA8452_CTRL_REG1,
>>>                            data->ctrl_reg1);
>>>            break;
>>> @@ -1528,6 +1546,7 @@ static int mma8452_probe(struct i2c_client *client,
>>>        case FXLS8471_DEVICE_ID:
>>>            if (ret == data->chip_info->chip_id)
>>>                break;
>>> +        /* FALLTHRU */
>> Please do this in a seperate patch.
>>>        default:
>>>            return -ENODEV;
>>>        }
>>> @@ -1593,6 +1612,9 @@ static int mma8452_probe(struct i2c_client *client,
>>>    
>>>        data->ctrl_reg1 = MMA8452_CTRL_ACTIVE |
>>>                  (MMA8452_CTRL_DR_DEFAULT << MMA8452_CTRL_DR_SHIFT);
>>> +
>>> +    data->sleep_val = mma8452_calculate_sleep(data);
>>> +
>>>        ret = i2c_smbus_write_byte_data(client, MMA8452_CTRL_REG1,
>>>                        data->ctrl_reg1);
>>>        if (ret < 0)
>> --
>> 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
>>


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH v3] iio: accell: mma8452: Reduce sleep time when data not ready
  2018-05-07  8:11       ` Martin Kepplinger
@ 2018-05-08  8:19         ` Richard Tresidder
  2018-05-09  9:57           ` Martin Kepplinger
  0 siblings, 1 reply; 8+ messages in thread
From: Richard Tresidder @ 2018-05-08  8:19 UTC (permalink / raw)
  To: Martin Kepplinger, linux-iio
  Cc: Jonathan Cameron, knaack.h, lars, pmeerw, harinath922

Modified the sleep method when data is not ready to allow for sampling > 50sps to work.

Signed-off-by: Richard Tresidder <rtresidd@electromag.com.au>
---
v3: Changes from v2
  * Removed fallthrough fix (will submit separately)
  * Fixed some blank lines, trailing white spaces.

v2: Changes from v1
  * Remove whitespace changes
  * Added fallthrough fix (subsequently removed)

drivers/iio/accel/mma8452.c | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c
index 7a2da7f..5650b59 100644
--- a/drivers/iio/accel/mma8452.c
+++ b/drivers/iio/accel/mma8452.c
@@ -106,6 +106,7 @@ struct mma8452_data {
 	u8 ctrl_reg1;
 	u8 data_cfg;
 	const struct mma_chip_info *chip_info;
+	int sleep_val;
 };
 
  /**
@@ -193,7 +194,10 @@ static int mma8452_drdy(struct mma8452_data *data)
 		if ((ret & MMA8452_STATUS_DRDY) == MMA8452_STATUS_DRDY)
 			return 0;
 
-		msleep(20);
+		if (data->sleep_val <= 20)
+			usleep_range(data->sleep_val * 250, data->sleep_val * 500);
+		else
+			msleep(20);
 	}
 
 	dev_err(&data->client->dev, "data not ready\n");
@@ -544,6 +548,18 @@ static int mma8452_read_raw(struct iio_dev *indio_dev,
 	return -EINVAL;
 }
 
+static int mma8452_calculate_sleep(struct mma8452_data *data)
+{
+	int ret, i = mma8452_get_odr_index(data);
+
+	if (mma8452_samp_freq[i][0] > 0)
+		ret = 1000 / mma8452_samp_freq[i][0];
+	else
+		ret = 1000;
+
+	return ret == 0 ? 1 : ret;
+}
+
 static int mma8452_standby(struct mma8452_data *data)
 {
 	return i2c_smbus_write_byte_data(data->client, MMA8452_CTRL_REG1,
@@ -700,6 +716,8 @@ static int mma8452_write_raw(struct iio_dev *indio_dev,
 		data->ctrl_reg1 &= ~MMA8452_CTRL_DR_MASK;
 		data->ctrl_reg1 |= i << MMA8452_CTRL_DR_SHIFT;
 
+		data->sleep_val = mma8452_calculate_sleep(data);
+
 		ret = mma8452_change_config(data, MMA8452_CTRL_REG1,
 					    data->ctrl_reg1);
 		break;
@@ -1593,6 +1611,9 @@ static int mma8452_probe(struct i2c_client *client,
 
 	data->ctrl_reg1 = MMA8452_CTRL_ACTIVE |
 			  (MMA8452_CTRL_DR_DEFAULT << MMA8452_CTRL_DR_SHIFT);
+
+	data->sleep_val = mma8452_calculate_sleep(data);
+
 	ret = i2c_smbus_write_byte_data(client, MMA8452_CTRL_REG1,
 					data->ctrl_reg1);
 	if (ret < 0)

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: [PATCH v3] iio: accell: mma8452: Reduce sleep time when data not ready
  2018-05-08  8:19         ` [PATCH v3] " Richard Tresidder
@ 2018-05-09  9:57           ` Martin Kepplinger
  2018-05-10  2:21             ` Richard Tresidder
  0 siblings, 1 reply; 8+ messages in thread
From: Martin Kepplinger @ 2018-05-09  9:57 UTC (permalink / raw)
  To: Richard Tresidder, linux-iio
  Cc: Jonathan Cameron, knaack.h, lars, pmeerw, harinath922

[-- Attachment #1: Type: text/plain, Size: 2665 bytes --]

On 2018-05-08 10:19, Richard Tresidder wrote:
> Modified the sleep method when data is not ready to allow for sampling > 50sps to work.
> 
> Signed-off-by: Richard Tresidder <rtresidd@electromag.com.au>
> ---
> v3: Changes from v2
>   * Removed fallthrough fix (will submit separately)
>   * Fixed some blank lines, trailing white spaces.
> 
> v2: Changes from v1
>   * Remove whitespace changes
>   * Added fallthrough fix (subsequently removed)
> 
> drivers/iio/accel/mma8452.c | 23 ++++++++++++++++++++++-
> 1 file changed, 22 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c
> index 7a2da7f..5650b59 100644
> --- a/drivers/iio/accel/mma8452.c
> +++ b/drivers/iio/accel/mma8452.c
> @@ -106,6 +106,7 @@ struct mma8452_data {
>  	u8 ctrl_reg1;
>  	u8 data_cfg;
>  	const struct mma_chip_info *chip_info;
> +	int sleep_val;
>  };
>  
>   /**
> @@ -193,7 +194,10 @@ static int mma8452_drdy(struct mma8452_data *data)
>  		if ((ret & MMA8452_STATUS_DRDY) == MMA8452_STATUS_DRDY)
>  			return 0;
>  
> -		msleep(20);
> +		if (data->sleep_val <= 20)
> +			usleep_range(data->sleep_val * 250, data->sleep_val * 500);

line over 80 chars. please use 2 lines.

Also, have you run checkpatch on this? You seem to have DOS line-endlings.

> +		else
> +			msleep(20);
>  	}
>  
>  	dev_err(&data->client->dev, "data not ready\n");
> @@ -544,6 +548,18 @@ static int mma8452_read_raw(struct iio_dev *indio_dev,
>  	return -EINVAL;
>  }
>  
> +static int mma8452_calculate_sleep(struct mma8452_data *data)
> +{
> +	int ret, i = mma8452_get_odr_index(data);
> +
> +	if (mma8452_samp_freq[i][0] > 0)
> +		ret = 1000 / mma8452_samp_freq[i][0];
> +	else
> +		ret = 1000;
> +
> +	return ret == 0 ? 1 : ret;
> +}
> +
>  static int mma8452_standby(struct mma8452_data *data)
>  {
>  	return i2c_smbus_write_byte_data(data->client, MMA8452_CTRL_REG1,
> @@ -700,6 +716,8 @@ static int mma8452_write_raw(struct iio_dev *indio_dev,
>  		data->ctrl_reg1 &= ~MMA8452_CTRL_DR_MASK;
>  		data->ctrl_reg1 |= i << MMA8452_CTRL_DR_SHIFT;
>  
> +		data->sleep_val = mma8452_calculate_sleep(data);
> +
>  		ret = mma8452_change_config(data, MMA8452_CTRL_REG1,
>  					    data->ctrl_reg1);
>  		break;
> @@ -1593,6 +1611,9 @@ static int mma8452_probe(struct i2c_client *client,
>  
>  	data->ctrl_reg1 = MMA8452_CTRL_ACTIVE |
>  			  (MMA8452_CTRL_DR_DEFAULT << MMA8452_CTRL_DR_SHIFT);
> +
> +	data->sleep_val = mma8452_calculate_sleep(data);
> +
>  	ret = i2c_smbus_write_byte_data(client, MMA8452_CTRL_REG1,
>  					data->ctrl_reg1);
>  	if (ret < 0)
> 


[-- Attachment #2: pEpkey.asc --]
[-- Type: application/pgp-keys, Size: 1795 bytes --]

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v3] iio: accell: mma8452: Reduce sleep time when data not ready
  2018-05-09  9:57           ` Martin Kepplinger
@ 2018-05-10  2:21             ` Richard Tresidder
  0 siblings, 0 replies; 8+ messages in thread
From: Richard Tresidder @ 2018-05-10  2:21 UTC (permalink / raw)
  To: Martin Kepplinger, linux-iio
  Cc: Jonathan Cameron, knaack.h, lars, pmeerw, harinath922

I'll take a look at the CRLF issue, seems the mail client is doing
it.... strike 3 for thunderbird..
Yes did run checkpatch
Yes did note that line was 3 chars longer than 80 "0);"
Aware that the coding standards allow this where it doesn't hide
anything substantial and I think it's more readable..
I'm ok to change it, just think it looks messy when split given it's in
an un-bracketed if else statement.
Theres over 100 of lines in the iio code alone that currently do the
same thing on the last variable (including this file), so I thought it'd
be ok.

Cheers
   Richard
On 9/05/2018 5:57 PM, Martin Kepplinger wrote:
> On 2018-05-08 10:19, Richard Tresidder wrote:
>> Modified the sleep method when data is not ready to allow for
sampling > 50sps to work.
>>
>> Signed-off-by: Richard Tresidder <rtresidd@electromag.com.au>
>> ---
>> v3: Changes from v2
>>   * Removed fallthrough fix (will submit separately)
>>   * Fixed some blank lines, trailing white spaces.
>>
>> v2: Changes from v1
>>   * Remove whitespace changes
>>   * Added fallthrough fix (subsequently removed)
>>
>> drivers/iio/accel/mma8452.c | 23 ++++++++++++++++++++++-
>> 1 file changed, 22 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/iio/accel/mma8452.c b/drivers/iio/accel/mma8452.c
>> index 7a2da7f..5650b59 100644
>> --- a/drivers/iio/accel/mma8452.c
>> +++ b/drivers/iio/accel/mma8452.c
>> @@ -106,6 +106,7 @@ struct mma8452_data {
>>      u8 ctrl_reg1;
>>      u8 data_cfg;
>>      const struct mma_chip_info *chip_info;
>> +    int sleep_val;
>>  };
>>
>>   /**
>> @@ -193,7 +194,10 @@ static int mma8452_drdy(struct mma8452_data *data)
>>          if ((ret & MMA8452_STATUS_DRDY) == MMA8452_STATUS_DRDY)
>>              return 0;
>>
>> -        msleep(20);
>> +        if (data->sleep_val <= 20)
>> +            usleep_range(data->sleep_val * 250, data->sleep_val * 500);
>
> line over 80 chars. please use 2 lines.
>
> Also, have you run checkpatch on this? You seem to have DOS line-endlings.
>
>> +        else
>> +            msleep(20);
>>      }
>>
>>      dev_err(&data->client->dev, "data not ready\n");
>> @@ -544,6 +548,18 @@ static int mma8452_read_raw(struct iio_dev
*indio_dev,
>>      return -EINVAL;
>>  }
>>
>> +static int mma8452_calculate_sleep(struct mma8452_data *data)
>> +{
>> +    int ret, i = mma8452_get_odr_index(data);
>> +
>> +    if (mma8452_samp_freq[i][0] > 0)
>> +        ret = 1000 / mma8452_samp_freq[i][0];
>> +    else
>> +        ret = 1000;
>> +
>> +    return ret == 0 ? 1 : ret;
>> +}
>> +
>>  static int mma8452_standby(struct mma8452_data *data)
>>  {
>>      return i2c_smbus_write_byte_data(data->client, MMA8452_CTRL_REG1,
>> @@ -700,6 +716,8 @@ static int mma8452_write_raw(struct iio_dev
*indio_dev,
>>          data->ctrl_reg1 &= ~MMA8452_CTRL_DR_MASK;
>>          data->ctrl_reg1 |= i << MMA8452_CTRL_DR_SHIFT;
>>
>> +        data->sleep_val = mma8452_calculate_sleep(data);
>> +
>>          ret = mma8452_change_config(data, MMA8452_CTRL_REG1,
>>                          data->ctrl_reg1);
>>          break;
>> @@ -1593,6 +1611,9 @@ static int mma8452_probe(struct i2c_client *client,
>>
>>      data->ctrl_reg1 = MMA8452_CTRL_ACTIVE |
>>                (MMA8452_CTRL_DR_DEFAULT << MMA8452_CTRL_DR_SHIFT);
>> +
>> +    data->sleep_val = mma8452_calculate_sleep(data);
>> +
>>      ret = i2c_smbus_write_byte_data(client, MMA8452_CTRL_REG1,
>>                      data->ctrl_reg1);
>>      if (ret < 0)
>>
>
>
>




^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2018-05-10  2:22 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-07  3:51 [PATCH v2] iio: accell: mma8452: Reduce sleep time when data not ready Richard Tresidder
2018-05-07  4:13 ` Richard Tresidder
2018-05-07  7:49   ` Martin Kepplinger
2018-05-07  7:59     ` Richard Tresidder
2018-05-07  8:11       ` Martin Kepplinger
2018-05-08  8:19         ` [PATCH v3] " Richard Tresidder
2018-05-09  9:57           ` Martin Kepplinger
2018-05-10  2:21             ` Richard Tresidder

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.