Re: [PATCH v4 13/17] dm: blk: Use IS_ENABLED() instead of #ifdefs in blk_post_probe

2020-08-06 Thread Tom Rini
On Fri, Jul 24, 2020 at 02:12:21PM +0300, Ovidiu Panait wrote:

> Use IS_ENABLED() instead of #ifdef in blk_post_probe function.
> 
> No functional change intended.
> 
> Reviewed-by: Simon Glass 
> Signed-off-by: Ovidiu Panait 

Applied to u-boot/master, thanks!

-- 
Tom


signature.asc
Description: PGP signature


[PATCH v4 13/17] dm: blk: Use IS_ENABLED() instead of #ifdefs in blk_post_probe

2020-07-24 Thread Ovidiu Panait
Use IS_ENABLED() instead of #ifdef in blk_post_probe function.

No functional change intended.

Reviewed-by: Simon Glass 
Signed-off-by: Ovidiu Panait 
---

 drivers/block/blk-uclass.c | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/block/blk-uclass.c b/drivers/block/blk-uclass.c
index b19375cbc8..b2738f5717 100644
--- a/drivers/block/blk-uclass.c
+++ b/drivers/block/blk-uclass.c
@@ -644,11 +644,12 @@ int blk_unbind_all(int if_type)
 
 static int blk_post_probe(struct udevice *dev)
 {
-#if defined(CONFIG_PARTITIONS) && defined(CONFIG_HAVE_BLOCK_DEVICE)
-   struct blk_desc *desc = dev_get_uclass_platdata(dev);
+   if (IS_ENABLED(CONFIG_PARTITIONS) &&
+   IS_ENABLED(CONFIG_HAVE_BLOCK_DEV)) {
+   struct blk_desc *desc = dev_get_uclass_platdata(dev);
 
-   part_init(desc);
-#endif
+   part_init(desc);
+   }
 
return 0;
 }
-- 
2.17.1