[PATCH 1/2] fixup! base: add class device support

[PATCH 1/2] fixup! base: add class device support

[Ahmad Fatoum]

base: class: fix class_remove_device to not corrupt the class list

class_remove_device is supposed to remove the device from the class, not
remove the class from its devices.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 drivers/base/class.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/base/class.c b/drivers/base/class.c
index 28ae828d658a..fd7d6b2d7a29 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -21,7 +21,7 @@ int class_add_device(struct class *class, struct device *dev)
 
 void class_remove_device(struct class *class, struct device *dev)
 {
-	list_del(&class->devices);
+	list_del(&dev->class_list);
 }
 
 extern struct class __barebox_class_start[];
-- 
2.39.2

[PATCH 2/2] fixup! net: register eth class

[Ahmad Fatoum]

net: fix crash removing uninitiailized eth_device::list during shutdown

next currently crashes on barebox_shutdown(), because list is no longer
initialized after being replaced by classes.

Fixes: 27ed36df29b1 ("net: register eth class")
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 include/net.h | 2 --
 net/eth.c     | 1 -
 2 files changed, 3 deletions(-)

diff --git a/include/net.h b/include/net.h
index 05d73e543f7e..a04ed5b0ab92 100644
--- a/include/net.h
+++ b/include/net.h
@@ -60,8 +60,6 @@ struct eth_device {
 	struct device *parent;
 	char *nodepath;
 
-	struct list_head list;
-
 	IPaddr_t ipaddr;
 	IPaddr_t netmask;
 	char ethaddr[6];
diff --git a/net/eth.c b/net/eth.c
index ce7d839ed113..7229530c055b 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -545,7 +545,6 @@ void eth_unregister(struct eth_device *edev)
 
 	unregister_device(&edev->dev);
 	slice_exit(&edev->slice);
-	list_del(&edev->list);
 }
 
 void led_trigger_network(enum led_trigger trigger)
-- 
2.39.2

Re: [PATCH 1/2] fixup! base: add class device support

[Sascha Hauer]

On Thu, 20 Jun 2024 14:55:47 +0200, Ahmad Fatoum wrote:
> base: class: fix class_remove_device to not corrupt the class list
> 
> class_remove_device is supposed to remove the device from the class, not
> remove the class from its devices.
> 
> 

Applied, thanks!

[1/2] fixup! base: add class device support
      https://git.pengutronix.de/cgit/barebox/commit/?id=f43bff7f39fd (link may not be stable)
[2/2] fixup! net: register eth class
      https://git.pengutronix.de/cgit/barebox/commit/?id=f4f7d0e3257c (link may not be stable)

Best regards,
-- 
Sascha Hauer <s.hauer@pengutronix.de>