diff mbox series

[-next,6/7] platform/olpc: olpc-xo175-ec: switch to use spi_target_abort().

Message ID 20240910022618.1397-7-yangyingliang@huaweicloud.com (mailing list archive)
State Accepted
Commit 5b2e4d15154cb75e522701c13f66441e29f2caa8
Headers show
Series spi: replace and remove spi_slave_abort() | expand

Commit Message

Yang Yingliang Sept. 10, 2024, 2:26 a.m. UTC 
From: Yang Yingliang <yangyingliang@huawei.com>

Switch to use modern name function spi_target_abort().

No functional changed.

Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
 drivers/platform/olpc/olpc-xo175-ec.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Hans de Goede Sept. 10, 2024, 9 a.m. UTC | #1 
Hi,

On 9/10/24 4:26 AM, Yang Yingliang wrote:
> From: Yang Yingliang <yangyingliang@huawei.com>
> 
> Switch to use modern name function spi_target_abort().
> 
> No functional changed.
> 
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>

Thanks, patch looks good to me.

Please merge this through the SPI tree together with the rest
of the series:

Acked-by: Hans de Goede <hdegoede@redhat.com>

Regards,

Hans

> ---
>  drivers/platform/olpc/olpc-xo175-ec.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/platform/olpc/olpc-xo175-ec.c b/drivers/platform/olpc/olpc-xo175-ec.c
> index 62ccbcb15c74..fa7b3bda688a 100644
> --- a/drivers/platform/olpc/olpc-xo175-ec.c
> +++ b/drivers/platform/olpc/olpc-xo175-ec.c
> @@ -536,7 +536,7 @@ static int olpc_xo175_ec_cmd(u8 cmd, u8 *inbuf, size_t inlen, u8 *resp,
>  		dev_err(dev, "EC cmd error: timeout in STATE %d\n",
>  				priv->cmd_state);
>  		gpiod_set_value_cansleep(priv->gpio_cmd, 0);
> -		spi_slave_abort(priv->spi);
> +		spi_target_abort(priv->spi);
>  		olpc_xo175_ec_read_packet(priv);
>  		return -ETIMEDOUT;
>  	}
> @@ -653,7 +653,7 @@ static void olpc_xo175_ec_remove(struct spi_device *spi)
>  	if (pm_power_off == olpc_xo175_ec_power_off)
>  		pm_power_off = NULL;
>  
> -	spi_slave_abort(spi);
> +	spi_target_abort(spi);
>  
>  	platform_device_unregister(olpc_ec);
>  	olpc_ec = NULL;
diff mbox series

Patch

diff --git a/drivers/platform/olpc/olpc-xo175-ec.c b/drivers/platform/olpc/olpc-xo175-ec.c
index 62ccbcb15c74..fa7b3bda688a 100644
--- a/drivers/platform/olpc/olpc-xo175-ec.c
+++ b/drivers/platform/olpc/olpc-xo175-ec.c
@@ -536,7 +536,7 @@  static int olpc_xo175_ec_cmd(u8 cmd, u8 *inbuf, size_t inlen, u8 *resp,
 		dev_err(dev, "EC cmd error: timeout in STATE %d\n",
 				priv->cmd_state);
 		gpiod_set_value_cansleep(priv->gpio_cmd, 0);
-		spi_slave_abort(priv->spi);
+		spi_target_abort(priv->spi);
 		olpc_xo175_ec_read_packet(priv);
 		return -ETIMEDOUT;
 	}
@@ -653,7 +653,7 @@  static void olpc_xo175_ec_remove(struct spi_device *spi)
 	if (pm_power_off == olpc_xo175_ec_power_off)
 		pm_power_off = NULL;
 
-	spi_slave_abort(spi);
+	spi_target_abort(spi);
 
 	platform_device_unregister(olpc_ec);
 	olpc_ec = NULL;