[v3,3/5] i2c: designware-baytrail: Only check iosf_mbi_available() for shared hosts
diff mbox

Message ID 20161210224350.10290-3-hdegoede@redhat.com
State Superseded
Headers show

Commit Message

Hans de Goede Dec. 10, 2016, 10:43 p.m. UTC
If (!shared_host) simply return 0, this avoids delaying the probe if
iosf_mbi_available() returns false when an i2c bus is not using the
punit semaphore.

Also move the if (!iosf_mbi_available()) check to above the
dev_info, so that we do not repeat the dev_info on every probe
until iosf_mbi_available() returns true.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
Changes in v2:
-New patch in v2 of this set
Changes in v3:
-Use if (!shared_host) return 0, to simplify the non-shared_host path
 and to avoid nested ifs
---
 drivers/i2c/busses/i2c-designware-baytrail.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

Comments

Andy Shevchenko Dec. 12, 2016, 10:19 a.m. UTC | #1
On Sat, 2016-12-10 at 23:43 +0100, Hans de Goede wrote:
> If (!shared_host) simply return 0, this avoids delaying the probe if
> iosf_mbi_available() returns false when an i2c bus is not using the
> punit semaphore.
> 
> Also move the if (!iosf_mbi_available()) check to above the
> dev_info, so that we do not repeat the dev_info on every probe
> until iosf_mbi_available() returns true.
> 

Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---
> Changes in v2:
> -New patch in v2 of this set
> Changes in v3:
> -Use if (!shared_host) return 0, to simplify the non-shared_host path
>  and to avoid nested ifs
> ---
>  drivers/i2c/busses/i2c-designware-baytrail.c | 13 +++++++------
>  1 file changed, 7 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/i2c/busses/i2c-designware-baytrail.c
> b/drivers/i2c/busses/i2c-designware-baytrail.c
> index a3f581c..cf02222 100644
> --- a/drivers/i2c/busses/i2c-designware-baytrail.c
> +++ b/drivers/i2c/busses/i2c-designware-baytrail.c
> @@ -138,15 +138,16 @@ int i2c_dw_eval_lock_support(struct dw_i2c_dev
> *dev)
>  	if (ACPI_FAILURE(status))
>  		return 0;
>  
> -	if (shared_host) {
> -		dev_info(dev->dev, "I2C bus managed by PUNIT\n");
> -		dev->acquire_lock = baytrail_i2c_acquire;
> -		dev->release_lock = baytrail_i2c_release;
> -		dev->pm_runtime_disabled = true;
> -	}
> +	if (!shared_host)
> +		return 0;
>  
>  	if (!iosf_mbi_available())
>  		return -EPROBE_DEFER;
>  
> +	dev_info(dev->dev, "I2C bus managed by PUNIT\n");
> +	dev->acquire_lock = baytrail_i2c_acquire;
> +	dev->release_lock = baytrail_i2c_release;
> +	dev->pm_runtime_disabled = true;
> +
>  	return 0;
>  }
Jarkko Nikula Dec. 12, 2016, 2:03 p.m. UTC | #2
On 12.12.2016 12:19, Andy Shevchenko wrote:
> On Sat, 2016-12-10 at 23:43 +0100, Hans de Goede wrote:
>> If (!shared_host) simply return 0, this avoids delaying the probe if
>> iosf_mbi_available() returns false when an i2c bus is not using the
>> punit semaphore.
>>
>> Also move the if (!iosf_mbi_available()) check to above the
>> dev_info, so that we do not repeat the dev_info on every probe
>> until iosf_mbi_available() returns true.
>>
>
> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
>
Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

diff --git a/drivers/i2c/busses/i2c-designware-baytrail.c b/drivers/i2c/busses/i2c-designware-baytrail.c
index a3f581c..cf02222 100644
--- a/drivers/i2c/busses/i2c-designware-baytrail.c
+++ b/drivers/i2c/busses/i2c-designware-baytrail.c
@@ -138,15 +138,16 @@  int i2c_dw_eval_lock_support(struct dw_i2c_dev *dev)
 	if (ACPI_FAILURE(status))
 		return 0;
 
-	if (shared_host) {
-		dev_info(dev->dev, "I2C bus managed by PUNIT\n");
-		dev->acquire_lock = baytrail_i2c_acquire;
-		dev->release_lock = baytrail_i2c_release;
-		dev->pm_runtime_disabled = true;
-	}
+	if (!shared_host)
+		return 0;
 
 	if (!iosf_mbi_available())
 		return -EPROBE_DEFER;
 
+	dev_info(dev->dev, "I2C bus managed by PUNIT\n");
+	dev->acquire_lock = baytrail_i2c_acquire;
+	dev->release_lock = baytrail_i2c_release;
+	dev->pm_runtime_disabled = true;
+
 	return 0;
 }