diff mbox series

[v2,4/4] Revert "iommu/of: Delete usage of driver_deferred_probe_check_state()"

Message ID 20220819221616.2107893-5-saravanak@google.com (mailing list archive)
State Not Applicable
Headers show
Series Bring back driver_deferred_probe_check_state() for now | expand

Checks

Context Check Description
netdev/tree_selection success Guessed tree name to be net-next
netdev/fixes_present success Fixes tag not required for -next series
netdev/subject_prefix success Link
netdev/cover_letter success Series has a cover letter
netdev/patch_count success Link
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 342 this patch: 342
netdev/cc_maintainers success CCed 6 of 6 maintainers
netdev/build_clang success Errors and warnings before: 5 this patch: 5
netdev/module_param success Was 0 now: 0
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success Fixes tag looks correct
netdev/build_allmodconfig_warn success Errors and warnings before: 342 this patch: 342
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 8 lines checked
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0

Commit Message

Saravana Kannan Aug. 19, 2022, 10:16 p.m. UTC 
This reverts commit b09796d528bbf06e3e10a4a8f78038719da7ebc6.

An issue was reported[1] on the original commit. I'll need to address that
before I can delete the use of driver_deferred_probe_check_state().  So,
bring it back for now.

[1] - https://lore.kernel.org/lkml/4799738.LvFx2qVVIh@steina-w/

Fixes: b09796d528bb ("iommu/of: Delete usage of driver_deferred_probe_check_state()")
Reported-by: Jean-Philippe Brucker <jpb@kernel.org>
Signed-off-by: Saravana Kannan <saravanak@google.com>
---
 drivers/iommu/of_iommu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jean-Philippe Brucker Aug. 23, 2022, 8:11 a.m. UTC | #1 
On Fri, Aug 19, 2022 at 03:16:14PM -0700, Saravana Kannan wrote:
> This reverts commit b09796d528bbf06e3e10a4a8f78038719da7ebc6.
> 
> An issue was reported[1] on the original commit. I'll need to address that
> before I can delete the use of driver_deferred_probe_check_state().  So,
> bring it back for now.
> 
> [1] - https://lore.kernel.org/lkml/4799738.LvFx2qVVIh@steina-w/

https://lore.kernel.org/lkml/Yv+dpeIPvde7oDHi@myrica/

> 
> Fixes: b09796d528bb ("iommu/of: Delete usage of driver_deferred_probe_check_state()")
> Reported-by: Jean-Philippe Brucker <jpb@kernel.org>
> Signed-off-by: Saravana Kannan <saravanak@google.com>

Tested-by: Jean-Philippe Brucker <jpb@kernel.org>

> ---
>  drivers/iommu/of_iommu.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c
> index 41f4eb005219..5696314ae69e 100644
> --- a/drivers/iommu/of_iommu.c
> +++ b/drivers/iommu/of_iommu.c
> @@ -40,7 +40,7 @@ static int of_iommu_xlate(struct device *dev,
>  	 * a proper probe-ordering dependency mechanism in future.
>  	 */
>  	if (!ops)
> -		return -ENODEV;
> +		return driver_deferred_probe_check_state(dev);
>  
>  	if (!try_module_get(ops->owner))
>  		return -ENODEV;
> -- 
> 2.37.1.595.g718a3a8f04-goog
>
diff mbox series

Patch

diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c
index 41f4eb005219..5696314ae69e 100644
--- a/drivers/iommu/of_iommu.c
+++ b/drivers/iommu/of_iommu.c
@@ -40,7 +40,7 @@  static int of_iommu_xlate(struct device *dev,
 	 * a proper probe-ordering dependency mechanism in future.
 	 */
 	if (!ops)
-		return -ENODEV;
+		return driver_deferred_probe_check_state(dev);
 
 	if (!try_module_get(ops->owner))
 		return -ENODEV;