Revert "i2c: i2c-qcom-geni: Add shutdown callback for i2c"
Subsystems (3)
PATCH 1/1 Revert "i2c: i2c-qcom-geni: Add shutdown callback for i2c"
This reverts commit e0371298ddc51761be257698554ea507ac8bf831. It was accidently applied despite discussion still going on.
--- drivers/i2c/busses/i2c-qcom-geni.c | 34 ------------------------------ 1 file changed, 34 deletions(-)
drivers/i2c/busses/i2c-qcom-geni.c +0 -34
@@ -375,32 +375,6 @@ static void geni_i2c_tx_msg_cleanup(struct geni_i2c_dev *gi2c, } } -static void geni_i2c_stop_xfer (struct geni_i2c_dev *gi2c) -{ -int ret; -u32 geni_status; -struct i2c_msg *cur; - -/* Resume device, as runtime suspend can happen anytime during transfer */ - ret =pm_runtime_get_sync (gi2c->se.dev); -if (ret <0 ) { -dev_err (gi2c->se.dev,"Failed to resume device: %d\n" , ret); -return ; - } - - geni_status =readl_relaxed (gi2c->se.base +SE_GENI_STATUS ); -if (geni_status &M_GENI_CMD_ACTIVE ) { - cur = gi2c->cur; -geni_i2c_abort_xfer (gi2c); -if (cur->flags &I2C_M_RD ) -geni_i2c_rx_msg_cleanup (gi2c, cur); -else -geni_i2c_tx_msg_cleanup (gi2c, cur); - } - -pm_runtime_put_sync_suspend (gi2c->se.dev); -} -static int geni_i2c_rx_one_msg (struct geni_i2c_dev *gi2c,struct i2c_msg *msg,u32 m_param) {
@@ -676,13 +650,6 @@ static int geni_i2c_remove(struct platform_device *pdev)return 0 ; } -static void geni_i2c_shutdown (struct platform_device *pdev) -{ -struct geni_i2c_dev *gi2c =platform_get_drvdata (pdev); - -geni_i2c_stop_xfer (gi2c); -} -static int __maybe_unused geni_i2c_runtime_suspend (struct device *dev) {int ret;
@@ -747,7 +714,6 @@ MODULE_DEVICE_TABLE(of, geni_i2c_dt_match);static struct platform_driver geni_i2c_driver = { .probe = geni_i2c_probe, .remove = geni_i2c_remove, - .shutdown = geni_i2c_shutdown, .driver = { .name ="geni_i2c" , .pm = &geni_i2c_pm_ops,
Signature · 1 line
2.29.2
Quoting Wolfram Sang (2021-02-24 01:23:13)
Quoted 5 lines
This reverts commit
e0371298ddc51761be257698554ea507ac8bf831. It was accidently applied despite discussion still going on.Signed-off-by Wolfram Sang <[email protected]>---
Thanks
Wolfram Sang
AppliedQuoted 4 lines · Wolfram Sang
This reverts commit
e0371298ddc51761be257698554ea507ac8bf831. It was accidently applied despite discussion still going on.Signed-off-by Wolfram Sang <[email protected]>
Applied to for-current, thanks!
This patch was applied to qcom/linux.git (refs/heads/for-next):
Hello:
This patch was applied to qcom/linux.git (refs/heads/for-next):
Quoted 7 lines · On Wed, 24 Feb 2021 10:23:13 +0100 you wrote:
This reverts commit
e0371298ddc51761be257698554ea507ac8bf831. It was accidently applied despite discussion still going on.Signed-off-by Wolfram Sang <[email protected]>--- drivers/i2c/busses/i2c-qcom-geni.c | 34 ------------------------------ 1 file changed, 34 deletions(-)
Here is the summary with links:
- Revert "i2c: i2c-qcom-geni: Add shutdown callback for i2c"
https://git.kernel.org/qcom/c/e87cc183cbff
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html