Skip to contentSkip to conversation

maple: remove unneeded maple_bus_uevent() callback.

PATCH In review Greg Kroah-Hartman 3 participants 4 messages Feb 1, 2023 SuperH

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 maple: remove unneeded maple_bus_uevent() callback.

The driver core recently changed the uevent bus callback to take a const pointer, and the maple_bus_uevent() was not correctly fixed up. Instead of fixing the function parameter types, just remove the callback entirely as it does not do anything, so it is not necessary.

Cc Yoshinori Sato <[email protected]>
Cc Rich Felker <[email protected]>
Cc Hans de Goede <[email protected]>
Cc "Rafael J. Wysocki" <[email protected]>
Fixes 2a81ada32f0e ("driver core: make struct bus_type.uevent() take a const *")

---
sh maintainers, I'll take this through my tree as that's where the offending commit is that causes the build breakage.

 drivers/sh/maple/maple.c | 7 -------
 1 file changed, 7 deletions(-)
drivers/sh/maple/maple.c +0 -7
index e24e220e56ee..e05473c5c267 100644
@@ -760,12 +760,6 @@ static int maple_match_bus_driver(struct device *devptr,
 	return 0;
 }
 
-static int maple_bus_uevent(struct device *dev,
-			    struct kobj_uevent_env *env)
-{
-	return 0;
-}
-
 static void maple_bus_release(struct device *dev)
 {
 }
@@ -782,7 +776,6 @@ static struct maple_driver maple_unsupported_device = {
 struct bus_type maple_bus_type = {
 	.name = "maple",
 	.match = maple_match_bus_driver,
-	.uevent = maple_bus_uevent,
 };
 EXPORT_SYMBOL_GPL(maple_bus_type);
 
Signature · 1 line
2.39.1
Tested-by on v1 1/1
#1 lore raw
Quoted 6 lines · Greg Kroah-Hartman

The driver core recently changed the uevent bus callback to take a const pointer, and the maple_bus_uevent() was not correctly fixed up. Instead of fixing the function parameter types, just remove the callback entirely as it does not do anything, so it is not necessary.

Quoted 8 lines
Cc Yoshinori Sato <[email protected]>
Cc Rich Felker <[email protected]>
Cc Hans de Goede <[email protected]>
Cc "Rafael J. Wysocki" <[email protected]>
Fixes 2a81ada32f0e ("driver core: make struct bus_type.uevent() take a const *")

Thank you for the quick fix.

Cheers,
Anders

Quoted 35 lines

---
sh maintainers, I'll take this through my tree as that's where the offending commit is that causes the build breakage.

 drivers/sh/maple/maple.c | 7 -------
 1 file changed, 7 deletions(-)
drivers/sh/maple/maple.c +0 -8
index e24e220e56ee..e05473c5c267 100644
@@ -760,12 +760,6 @@ static int maple_match_bus_driver(struct device *devptr,
        return 0;
 }
 
-static int maple_bus_uevent(struct device *dev,
-                           struct kobj_uevent_env *env)
-{
-       return 0;
-}
-
 static void maple_bus_release(struct device *dev)
 {
 }
@@ -782,7 +776,6 @@ static struct maple_driver maple_unsupported_device = {
 struct bus_type maple_bus_type = {
        .name = "maple",
        .match = maple_match_bus_driver,
-       .uevent = maple_bus_uevent,
 };
 EXPORT_SYMBOL_GPL(maple_bus_type);
 
--

2.39.1

#2 lore raw
In reply to Greg Kroah-Hartman

Hi Greg!

Quoted 38 lines · Greg Kroah-Hartman

The driver core recently changed the uevent bus callback to take a const pointer, and the maple_bus_uevent() was not correctly fixed up. Instead of fixing the function parameter types, just remove the callback entirely as it does not do anything, so it is not necessary.

Cc Yoshinori Sato <[email protected]>
Cc Rich Felker <[email protected]>
Cc Hans de Goede <[email protected]>
Cc "Rafael J. Wysocki" <[email protected]>
Fixes 2a81ada32f0e ("driver core: make struct bus_type.uevent() take a const *")

---
sh maintainers, I'll take this through my tree as that's where the offending commit is that causes the build breakage.

 drivers/sh/maple/maple.c | 7 -------
 1 file changed, 7 deletions(-)
drivers/sh/maple/maple.c +0 -6
index e24e220e56ee..e05473c5c267 100644
@@ -760,12 +760,6 @@ static int maple_match_bus_driver(struct device *devptr,
 	return 0;
 }
 
-static int maple_bus_uevent(struct device *dev,
-			    struct kobj_uevent_env *env)
-{
-	return 0;
-}
-
 static void maple_bus_release(struct device *dev)
 {
 }

drivers/sh/maple/maple.c static struct maple_driver maple_unsupported_device = { · line 780

Quoted 6 lines
drivers/sh/maple/maple.c +0 -1
@@ -782,7 +776,6 @@ static struct maple_driver maple_unsupported_device = {
 struct bus_type maple_bus_type = {
 	.name = "maple",
 	.match = maple_match_bus_driver,
-	.uevent = maple_bus_uevent,
 };
 EXPORT_SYMBOL_GPL(maple_bus_type);

Through which tree is this supposed to be picked up?

FWIW, we have set up a new SH tree now, but I am not designated as an official SH maintainer yet which is what I would like to become in order to support Rich Felker.

Adrian

Signature · 4 lines
 .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer
`. `'   Physicist
  `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913
#3 lore raw
Quoted 41 lines · John Paul Adrian Glaubitz

Hi Greg!

Quoted 38 lines · Greg Kroah-Hartman

The driver core recently changed the uevent bus callback to take a const pointer, and the maple_bus_uevent() was not correctly fixed up. Instead of fixing the function parameter types, just remove the callback entirely as it does not do anything, so it is not necessary.

Cc Yoshinori Sato <[email protected]>
Cc Rich Felker <[email protected]>
Cc Hans de Goede <[email protected]>
Cc "Rafael J. Wysocki" <[email protected]>
Fixes 2a81ada32f0e ("driver core: make struct bus_type.uevent() take a const *")

---
sh maintainers, I'll take this through my tree as that's where the offending commit is that causes the build breakage.

 drivers/sh/maple/maple.c | 7 -------
 1 file changed, 7 deletions(-)
drivers/sh/maple/maple.c +0 -6
index e24e220e56ee..e05473c5c267 100644
@@ -760,12 +760,6 @@ static int maple_match_bus_driver(struct device *devptr,
 	return 0;
 }
 
-static int maple_bus_uevent(struct device *dev,
-			    struct kobj_uevent_env *env)
-{
-	return 0;
-}
-
 static void maple_bus_release(struct device *dev)
 {
 }
@@ -782,7 +776,6 @@ static struct maple_driver maple_unsupported_device = {
Quoted 8 lines

drivers/sh/maple/maple.c static struct maple_driver maple_unsupported_device = { · line 780

Quoted 6 lines
drivers/sh/maple/maple.c +0 -1
 struct bus_type maple_bus_type = {
 	.name = "maple",
 	.match = maple_match_bus_driver,
-	.uevent = maple_bus_uevent,
 };
 EXPORT_SYMBOL_GPL(maple_bus_type);

Through which tree is this supposed to be picked up?

As the comment below the --- line said above:

sh maintainers, I'll take this through my tree as that's where the offending commit is that causes the build breakage.

So I took it :)

thanks,

greg k-h