From: Andy Shevchenko Date: Mon, 26 Aug 2019 17:26:23 +0000 (+0300) Subject: can: mcp251x: Call wrapper instead of regulator_disable() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=761a61591705bffb46641dfe4df4c8bb5d011ef6;p=linux.git can: mcp251x: Call wrapper instead of regulator_disable() There is no need to check for regulator presence in the ->suspend() since a wrapper does it for us. Due to this we may unconditionally set AFTER_SUSPEND_POWER flag. Signed-off-by: Andy Shevchenko Signed-off-by: Marc Kleine-Budde --- diff --git a/drivers/net/can/spi/mcp251x.c b/drivers/net/can/spi/mcp251x.c index e0885499f6049..bee9f7b8dad61 100644 --- a/drivers/net/can/spi/mcp251x.c +++ b/drivers/net/can/spi/mcp251x.c @@ -1142,10 +1142,8 @@ static int __maybe_unused mcp251x_can_suspend(struct device *dev) priv->after_suspend = AFTER_SUSPEND_DOWN; } - if (!IS_ERR_OR_NULL(priv->power)) { - regulator_disable(priv->power); - priv->after_suspend |= AFTER_SUSPEND_POWER; - } + mcp251x_power_enable(priv->power, 0); + priv->after_suspend |= AFTER_SUSPEND_POWER; return 0; }