driver core: attribute_container: change return type to void

attribute_container_register() has always returned 0 since its
introduction in commit 06ff5a987e ("Add attribute container to generic
device model") in the historical Linux tree [1]. Convert the return type
to void and update all callers.

This removes dead code where callers checked for errors that could never
occur.

Link: https://git.kernel.org/pub/scm/linux/kernel/git/tglx/history.git
Signed-off-by: Daniel Gomez <da.gomez@samsung.com>
Link: https://patch.msgid.link/20251220-dev-attribute-container-linux-scsi-v1-1-d58fcd03bf21@samsung.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/base/attribute_container.c b/drivers/base/attribute_container.c
index b6f941a6ab693a7a85cbc030c68adec1e76612c5..72adbacc65540ec8a08fcef414fec11a472339c5 100644 (file)
--- a/drivers/base/attribute_container.c
+++ b/drivers/base/attribute_container.c
@@ -69,7 +69,7 @@ static DEFINE_MUTEX(attribute_container_mutex);
  * @cont: The container to register.  This must be allocated by the
  *        callee and should also be zeroed by it.
  */
-int
+void
 attribute_container_register(struct attribute_container *cont)
 {
        INIT_LIST_HEAD(&cont->node);
@@ -79,8 +79,6 @@ attribute_container_register(struct attribute_container *cont)
        mutex_lock(&attribute_container_mutex);
        list_add_tail(&cont->node, &attribute_container_list);
        mutex_unlock(&attribute_container_mutex);
-
-       return 0;
 }
 EXPORT_SYMBOL_GPL(attribute_container_register);
 

diff --git a/drivers/base/transport_class.c b/drivers/base/transport_class.c
index 09ee2a1e35bbd3a4bf2f3995262af47df317b5c9..4b1e8820e7644f594c6d5d8a9ca5e624b7cd8569 100644 (file)
--- a/drivers/base/transport_class.c
+++ b/drivers/base/transport_class.c
@@ -88,17 +88,13 @@ static int anon_transport_dummy_function(struct transport_container *tc,
  * events.  Use prezero and then use DECLARE_ANON_TRANSPORT_CLASS() to
  * initialise the anon transport class storage.
  */
-int anon_transport_class_register(struct anon_transport_class *atc)
+void anon_transport_class_register(struct anon_transport_class *atc)
 {
-       int error;
        atc->container.class = &atc->tclass.class;
        attribute_container_set_no_classdevs(&atc->container);
-       error = attribute_container_register(&atc->container);
-       if (error)
-               return error;
+       attribute_container_register(&atc->container);
        atc->tclass.setup = anon_transport_dummy_function;
        atc->tclass.remove = anon_transport_dummy_function;
-       return 0;
 }
 EXPORT_SYMBOL_GPL(anon_transport_class_register);
 

diff --git a/drivers/scsi/scsi_transport_spi.c b/drivers/scsi/scsi_transport_spi.c
index fe47850a82587f567c3e89ee18c14ad966e0baa7..17a4a0918fc4bda20097c64562736490913154f8 100644 (file)
--- a/drivers/scsi/scsi_transport_spi.c
+++ b/drivers/scsi/scsi_transport_spi.c
@@ -1622,7 +1622,7 @@ static __init int spi_transport_init(void)
        error = transport_class_register(&spi_transport_class);
        if (error)
                return error;
-       error = anon_transport_class_register(&spi_device_class);
+       anon_transport_class_register(&spi_device_class);
        return transport_class_register(&spi_host_class);
 }
 

diff --git a/include/linux/attribute_container.h b/include/linux/attribute_container.h
index b3643de9931d4c821106d1455c183c389454d045..fa6520e192be6f7f26523d3c49099dd57b2219e1 100644 (file)
--- a/include/linux/attribute_container.h
+++ b/include/linux/attribute_container.h
@@ -36,7 +36,7 @@ attribute_container_set_no_classdevs(struct attribute_container *atc)
        atc->flags |= ATTRIBUTE_CONTAINER_NO_CLASSDEVS;
 }
 
-int attribute_container_register(struct attribute_container *cont);
+void attribute_container_register(struct attribute_container *cont);
 int __must_check attribute_container_unregister(struct attribute_container *cont);
 void attribute_container_create_device(struct device *dev,
                                       int (*fn)(struct attribute_container *,

diff --git a/include/linux/transport_class.h b/include/linux/transport_class.h
index 2efc271a96fa6bcaa3ec9506a927b67aa080a36e..9c2e0310446193057ad497fe84abf50d428535f2 100644 (file)
--- a/include/linux/transport_class.h
+++ b/include/linux/transport_class.h
@@ -87,9 +87,9 @@ transport_unregister_device(struct device *dev)
        transport_destroy_device(dev);
 }
 
-static inline int transport_container_register(struct transport_container *tc)
+static inline void transport_container_register(struct transport_container *tc)
 {
-       return attribute_container_register(&tc->ac);
+       attribute_container_register(&tc->ac);
 }
 
 static inline void transport_container_unregister(struct transport_container *tc)
@@ -99,7 +99,7 @@ static inline void transport_container_unregister(struct transport_container *tc
 }
 
 int transport_class_register(struct transport_class *);
-int anon_transport_class_register(struct anon_transport_class *);
+void anon_transport_class_register(struct anon_transport_class *);
 void transport_class_unregister(struct transport_class *);
 void anon_transport_class_unregister(struct anon_transport_class *);