soundwire: bus: simplify by using local slave->prop

[PATCH] soundwire: bus: simplify by using local slave->prop

Posted by Krzysztof Kozlowski 1 year, 5 months ago

The sdw_initialize_slave() function stores 'slave->prop' as local 'prop'
variable, so use it in all applicable places to make code a bit simpler.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 drivers/soundwire/bus.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c
index 191e6cc6f962..263ca32f0c5c 100644
--- a/drivers/soundwire/bus.c
+++ b/drivers/soundwire/bus.c
@@ -1410,7 +1410,7 @@ static int sdw_initialize_slave(struct sdw_slave *slave)
 		}
 	}
 	if ((slave->bus->prop.quirks & SDW_MASTER_QUIRKS_CLEAR_INITIAL_PARITY) &&
-	    !(slave->prop.quirks & SDW_SLAVE_QUIRKS_INVALID_INITIAL_PARITY)) {
+	    !(prop->quirks & SDW_SLAVE_QUIRKS_INVALID_INITIAL_PARITY)) {
 		/* Clear parity interrupt before enabling interrupt mask */
 		status = sdw_read_no_pm(slave, SDW_SCP_INT1);
 		if (status < 0) {
@@ -1436,7 +1436,7 @@ static int sdw_initialize_slave(struct sdw_slave *slave)
 	 * device-dependent, it might e.g. only be enabled in
 	 * steady-state after a couple of frames.
 	 */
-	val = slave->prop.scp_int1_mask;
+	val = prop->scp_int1_mask;
 
 	/* Enable SCP interrupts */
 	ret = sdw_update_no_pm(slave, SDW_SCP_INTMASK1, val, val);
@@ -1447,7 +1447,7 @@ static int sdw_initialize_slave(struct sdw_slave *slave)
 	}
 
 	/* No need to continue if DP0 is not present */
-	if (!slave->prop.dp0_prop)
+	if (!prop->dp0_prop)
 		return 0;
 
 	/* Enable DP0 interrupts */
-- 
2.43.0

Re: [PATCH] soundwire: bus: simplify by using local slave->prop

Posted by Vinod Koul 1 year, 5 months ago

On Thu, 20 Jun 2024 11:10:46 +0200, Krzysztof Kozlowski wrote:
> The sdw_initialize_slave() function stores 'slave->prop' as local 'prop'
> variable, so use it in all applicable places to make code a bit simpler.
> 
> 

Applied, thanks!

[1/1] soundwire: bus: simplify by using local slave->prop
      commit: 5a4c1f0207d8925c45a516d8dc85f0dd70c020ef

Best regards,
-- 
Vinod Koul <vkoul@kernel.org>

Re: [PATCH] soundwire: bus: simplify by using local slave->prop

Posted by Pierre-Louis Bossart 1 year, 5 months ago


On 6/20/24 11:10, Krzysztof Kozlowski wrote:
> The sdw_initialize_slave() function stores 'slave->prop' as local 'prop'
> variable, so use it in all applicable places to make code a bit simpler.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

> ---
>  drivers/soundwire/bus.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c
> index 191e6cc6f962..263ca32f0c5c 100644
> --- a/drivers/soundwire/bus.c
> +++ b/drivers/soundwire/bus.c
> @@ -1410,7 +1410,7 @@ static int sdw_initialize_slave(struct sdw_slave *slave)
>  		}
>  	}
>  	if ((slave->bus->prop.quirks & SDW_MASTER_QUIRKS_CLEAR_INITIAL_PARITY) &&
> -	    !(slave->prop.quirks & SDW_SLAVE_QUIRKS_INVALID_INITIAL_PARITY)) {
> +	    !(prop->quirks & SDW_SLAVE_QUIRKS_INVALID_INITIAL_PARITY)) {
>  		/* Clear parity interrupt before enabling interrupt mask */
>  		status = sdw_read_no_pm(slave, SDW_SCP_INT1);
>  		if (status < 0) {
> @@ -1436,7 +1436,7 @@ static int sdw_initialize_slave(struct sdw_slave *slave)
>  	 * device-dependent, it might e.g. only be enabled in
>  	 * steady-state after a couple of frames.
>  	 */
> -	val = slave->prop.scp_int1_mask;
> +	val = prop->scp_int1_mask;
>  
>  	/* Enable SCP interrupts */
>  	ret = sdw_update_no_pm(slave, SDW_SCP_INTMASK1, val, val);
> @@ -1447,7 +1447,7 @@ static int sdw_initialize_slave(struct sdw_slave *slave)
>  	}
>  
>  	/* No need to continue if DP0 is not present */
> -	if (!slave->prop.dp0_prop)
> +	if (!prop->dp0_prop)
>  		return 0;
>  
>  	/* Enable DP0 interrupts */