Revert "spi: spi-cadence-quadspi: Fix pm runtime unbalance"
This reverts commit
cdfb20e4b34ad99b3fe122aafb4f8ee7b9856e1f which is
commit
b07f349d1864abe29436f45e3047da2bdd476462 upstream.
There is cadence-qspi
ff8d2000.spi: Unbalanced pm_runtime_enable! error
without this revert.
After reverting commit
cdfb20e4b34a ("spi: spi-cadence-quadspi: Fix pm runtime unbalance")
and commit
1af6d1696ca4 ("spi: cadence-quadspi: fix cleanup of rx_chan on failure paths"),
Unbalanced pm_runtime_enable! error does not appear.
These two commits are backported from upstream commit
b07f349d1864 ("spi: spi-cadence-quadspi: Fix pm runtime unbalance")
and commit
04a8ff1bc351 ("spi: cadence-quadspi: fix cleanup of rx_chan on failure paths").
The commit
04a8ff1bc351 ("spi: cadence-quadspi: fix cleanup of rx_chan on failure paths")
fix commit
b07f349d1864 ("spi: spi-cadence-quadspi: Fix pm runtime unbalance").
The commit
b07f349d1864 ("spi: spi-cadence-quadspi: Fix pm runtime unbalance") fix
commit
86401132d7bb ("spi: spi-cadence-quadspi: Fix missing unwind goto warnings").
The commit
86401132d7bb ("spi: spi-cadence-quadspi: Fix missing unwind goto warnings") fix
commit
0578a6dbfe75 ("spi: spi-cadence-quadspi: add runtime pm support").
6.6.y only backport commit
b07f349d1864 ("spi: spi-cadence-quadspi: Fix pm runtime unbalance")
and commit
04a8ff1bc351 ("spi: cadence-quadspi: fix cleanup of rx_chan on failure paths"),
but does not backport commit
0578a6dbfe75 ("spi: spi-cadence-quadspi: add runtime pm support")
and commit
86401132d7bb ("spi: spi-cadence-quadspi: Fix missing unwind goto warnings").
And the backport of commit
b07f349d1864 ("spi: spi-cadence-quadspi: Fix pm runtime unbalance")
differs with the original patch. So there is Unbalanced pm_runtime_enable error.
If revert the backport for commit
b07f349d1864 ("spi: spi-cadence-quadspi: Fix pm runtime unbalance")
and commit
04a8ff1bc351 ("spi: cadence-quadspi: fix cleanup of rx_chan on failure paths"), there is no error.
If backport commit
0578a6dbfe75 ("spi: spi-cadence-quadspi: add runtime pm support") and
commit
86401132d7bb ("spi: spi-cadence-quadspi: Fix missing unwind goto warnings"), there
is hang during booting. I didn't find the cause of the hang.
Since commit
0578a6dbfe75 ("spi: spi-cadence-quadspi: add runtime pm support") and
commit
86401132d7bb ("spi: spi-cadence-quadspi: Fix missing unwind goto warnings") are
not backported, commit
b07f349d1864 ("spi: spi-cadence-quadspi: Fix pm runtime unbalance")
and commit
04a8ff1bc351 ("spi: cadence-quadspi: fix cleanup of rx_chan on failure paths") are not needed.
So revert commits commit
cdfb20e4b34a ("spi: spi-cadence-quadspi: Fix pm runtime unbalance") and
commit
1af6d1696ca4 ("spi: cadence-quadspi: fix cleanup of rx_chan on failure paths").
Signed-off-by: Jinfeng Wang <jinfeng.wang.cn@windriver.com>
Signed-off-by: He Zhe <zhe.he@windriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>