Commit b7810ea8 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Greg Kroah-Hartman
Browse files

driver core: fixup for "driver core: make struct bus_type.uevent() take a const *" 



After merging the driver-core tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

arch/powerpc/platforms/ps3/system-bus.c:472:19: error: initialization of 'int (*)(const struct device *, struct kobj_uevent_env *)' from incompatible pointer type 'int (*)(struct device *, struct kobj_uevent_env *)' [-Werror=incompatible-pointer-types]
  472 |         .uevent = ps3_system_bus_uevent,
      |                   ^~~~~~~~~~~~~~~~~~~~~
arch/powerpc/platforms/ps3/system-bus.c:472:19: note: (near initialization for 'ps3_system_bus_type.uevent')
arch/powerpc/platforms/pseries/ibmebus.c:436:22: error: initialization of 'int (*)(const struct device *, struct kobj_uevent_env *)' from incompatible pointer type 'int (*)(struct device *, struct kobj_uevent_env *)' [-Werror=incompatible-pointer-types]
  436 |         .uevent    = ibmebus_bus_modalias,
      |                      ^~~~~~~~~~~~~~~~~~~~
arch/powerpc/platforms/pseries/ibmebus.c:436:22: note: (near initialization for 'ibmebus_bus_type.uevent')

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Fixes: 2a81ada3 ("driver core: make struct bus_type.uevent() take a const *")
Link: https://lore.kernel.org/r/20230130152818.03c00ea3@canb.auug.org.au


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 56d5f362

arch/powerpc/include/asm/ps3.h

+1 −1
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ static inline struct ps3_system_bus_driver *ps3_drv_to_system_bus_drv( 
	return container_of(_drv, struct ps3_system_bus_driver, core);

}

static inline struct ps3_system_bus_device *ps3_dev_to_system_bus_dev(

	struct device *_dev)

	const struct device *_dev)

{

	return container_of(_dev, struct ps3_system_bus_device, core);

}

arch/powerpc/platforms/ps3/system-bus.c

+1 −1
Original line number Diff line number Diff line
@@ -439,7 +439,7 @@ static void ps3_system_bus_shutdown(struct device *_dev) 
	dev_dbg(&dev->core, " <- %s:%d\n", __func__, __LINE__);

}



static int ps3_system_bus_uevent(struct device *_dev, struct kobj_uevent_env *env)

static int ps3_system_bus_uevent(const struct device *_dev, struct kobj_uevent_env *env)

{

	struct ps3_system_bus_device *dev = ps3_dev_to_system_bus_dev(_dev);

arch/powerpc/platforms/pseries/ibmebus.c

+1 −1
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ static struct attribute *ibmebus_bus_device_attrs[] = { 
};

ATTRIBUTE_GROUPS(ibmebus_bus_device);



static int ibmebus_bus_modalias(struct device *dev, struct kobj_uevent_env *env)

static int ibmebus_bus_modalias(const struct device *dev, struct kobj_uevent_env *env)

{

	return of_device_uevent_modalias(dev, env);

}