driver core: return bool from driver_probe_done

bool is the most sensible return value for a yes/no return.  Also
add __init as this funtion is only called from the early boot code.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/20230531125535.676098-2-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index 9c09ca5c4ab68e347e83f6547c8de122a12f5c62..878aa7646b37e49625f8d9990c343c4264eec833 100644 (file)
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -751,14 +751,12 @@ static int really_probe_debug(struct device *dev, struct device_driver *drv)
  *
  * Should somehow figure out how to use a semaphore, not an atomic variable...
  */
-int driver_probe_done(void)
+bool __init driver_probe_done(void)
 {
        int local_probe_count = atomic_read(&probe_count);
 
        pr_debug("%s: probe_count = %d\n", __func__, local_probe_count);
-       if (local_probe_count)
-               return -EBUSY;
-       return 0;
+       return !local_probe_count;
 }
 
 /**

diff --git a/include/linux/device/driver.h b/include/linux/device/driver.h
index c244267a67443effebee447d3117cfcfe95d61be..7738f458995fba858e0e3ead9e5d12ceed35730d 100644 (file)
--- a/include/linux/device/driver.h
+++ b/include/linux/device/driver.h
@@ -126,7 +126,7 @@ int __must_check driver_register(struct device_driver *drv);
 void driver_unregister(struct device_driver *drv);
 
 struct device_driver *driver_find(const char *name, const struct bus_type *bus);
-int driver_probe_done(void);
+bool __init driver_probe_done(void);
 void wait_for_device_probe(void);
 void __init wait_for_init_devices_probe(void);
 

diff --git a/init/do_mounts.c b/init/do_mounts.c
index 811e94daf0a84af833eda996af765c1f05926680..2fe7901b5bcfafa82fa29451af5e5833db2fd93d 100644 (file)
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -635,7 +635,7 @@ void __init prepare_namespace(void)
        if ((ROOT_DEV == 0) && root_wait) {
                printk(KERN_INFO "Waiting for root device %s...\n",
                        saved_root_name);
-               while (driver_probe_done() != 0 ||
+               while (!driver_probe_done() ||
                        (ROOT_DEV = name_to_dev_t(saved_root_name)) == 0)
                        msleep(5);
                async_synchronize_full();