Commit a77ad4bf authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

of: device: make of_device_uevent_modalias() take a const device *

of_device_uevent_modalias() does not modify the device pointer passed to
it, so mark it constant.  In order to properly do this, a number of
busses need to have a modalias function added as they were attempting to
just point to of_device_uevent_modalias instead of their bus-specific
modalias function.  This is fine except if the prototype for a bus and
device type modalias function diverges and then problems could happen.  To
prevent all of that, just wrap the call to of_device_uevent_modalias()
directly for each bus and device type individually.

Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Nicholas Piggin <npiggin@gmail.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Chen-Yu Tsai <wens@csie.org>
Cc: Jernej Skrabec <jernej.skrabec@gmail.com>
Cc: Samuel Holland <samuel@sholland.org>
Cc: David Airlie <airlied@gmail.com>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Frank Rowand <frowand.list@gmail.com>
Cc: Liang He <windhl@126.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Cc: Douglas Anderson <dianders@chromium.org>
Cc: Lyude Paul <lyude@redhat.com>
Cc: Corentin Labbe <clabbe@baylibre.com>
Cc: Zou Wei <zou_wei@huawei.com>
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-sunxi@lists.linux.dev
Cc: dri-devel@lists.freedesktop.org
Cc: devicetree@vger.kernel.org
Acked-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20230111113018.459199-2-gregkh@linuxfoundation.orgSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8e3938a5
...@@ -426,9 +426,14 @@ static struct attribute *ibmebus_bus_device_attrs[] = { ...@@ -426,9 +426,14 @@ static struct attribute *ibmebus_bus_device_attrs[] = {
}; };
ATTRIBUTE_GROUPS(ibmebus_bus_device); ATTRIBUTE_GROUPS(ibmebus_bus_device);
static int ibmebus_bus_modalias(struct device *dev, struct kobj_uevent_env *env)
{
return of_device_uevent_modalias(dev, env);
}
struct bus_type ibmebus_bus_type = { struct bus_type ibmebus_bus_type = {
.name = "ibmebus", .name = "ibmebus",
.uevent = of_device_uevent_modalias, .uevent = ibmebus_bus_modalias,
.bus_groups = ibmbus_bus_groups, .bus_groups = ibmbus_bus_groups,
.match = ibmebus_bus_bus_match, .match = ibmebus_bus_bus_match,
.probe = ibmebus_bus_device_probe, .probe = ibmebus_bus_device_probe,
......
...@@ -172,12 +172,17 @@ static void sunxi_rsb_device_remove(struct device *dev) ...@@ -172,12 +172,17 @@ static void sunxi_rsb_device_remove(struct device *dev)
drv->remove(to_sunxi_rsb_device(dev)); drv->remove(to_sunxi_rsb_device(dev));
} }
static int sunxi_rsb_device_modalias(struct device *dev, struct kobj_uevent_env *env)
{
return of_device_uevent_modalias(dev, env);
}
static struct bus_type sunxi_rsb_bus = { static struct bus_type sunxi_rsb_bus = {
.name = RSB_CTRL_NAME, .name = RSB_CTRL_NAME,
.match = sunxi_rsb_device_match, .match = sunxi_rsb_device_match,
.probe = sunxi_rsb_device_probe, .probe = sunxi_rsb_device_probe,
.remove = sunxi_rsb_device_remove, .remove = sunxi_rsb_device_remove,
.uevent = of_device_uevent_modalias, .uevent = sunxi_rsb_device_modalias,
}; };
static void sunxi_rsb_dev_release(struct device *dev) static void sunxi_rsb_dev_release(struct device *dev)
......
...@@ -161,9 +161,14 @@ static void dp_aux_ep_dev_release(struct device *dev) ...@@ -161,9 +161,14 @@ static void dp_aux_ep_dev_release(struct device *dev)
kfree(aux_ep_with_data); kfree(aux_ep_with_data);
} }
static int dp_aux_ep_dev_modalias(struct device *dev, struct kobj_uevent_env *env)
{
return of_device_uevent_modalias(dev, env);
}
static struct device_type dp_aux_device_type_type = { static struct device_type dp_aux_device_type_type = {
.groups = dp_aux_ep_dev_groups, .groups = dp_aux_ep_dev_groups,
.uevent = of_device_uevent_modalias, .uevent = dp_aux_ep_dev_modalias,
.release = dp_aux_ep_dev_release, .release = dp_aux_ep_dev_release,
}; };
......
...@@ -128,12 +128,17 @@ static int macio_device_resume(struct device * dev) ...@@ -128,12 +128,17 @@ static int macio_device_resume(struct device * dev)
return 0; return 0;
} }
static int macio_device_modalias(struct device *dev, struct kobj_uevent_env *env)
{
return of_device_uevent_modalias(dev, env);
}
extern const struct attribute_group *macio_dev_groups[]; extern const struct attribute_group *macio_dev_groups[];
struct bus_type macio_bus_type = { struct bus_type macio_bus_type = {
.name = "macio", .name = "macio",
.match = macio_bus_match, .match = macio_bus_match,
.uevent = of_device_uevent_modalias, .uevent = macio_device_modalias,
.probe = macio_device_probe, .probe = macio_device_probe,
.remove = macio_device_remove, .remove = macio_device_remove,
.shutdown = macio_device_shutdown, .shutdown = macio_device_shutdown,
......
...@@ -248,7 +248,7 @@ const void *of_device_get_match_data(const struct device *dev) ...@@ -248,7 +248,7 @@ const void *of_device_get_match_data(const struct device *dev)
} }
EXPORT_SYMBOL(of_device_get_match_data); EXPORT_SYMBOL(of_device_get_match_data);
static ssize_t of_device_get_modalias(struct device *dev, char *str, ssize_t len) static ssize_t of_device_get_modalias(const struct device *dev, char *str, ssize_t len)
{ {
const char *compat; const char *compat;
char *c; char *c;
...@@ -372,7 +372,7 @@ void of_device_uevent(const struct device *dev, struct kobj_uevent_env *env) ...@@ -372,7 +372,7 @@ void of_device_uevent(const struct device *dev, struct kobj_uevent_env *env)
mutex_unlock(&of_mutex); mutex_unlock(&of_mutex);
} }
int of_device_uevent_modalias(struct device *dev, struct kobj_uevent_env *env) int of_device_uevent_modalias(const struct device *dev, struct kobj_uevent_env *env)
{ {
int sl; int sl;
......
...@@ -36,7 +36,7 @@ extern ssize_t of_device_modalias(struct device *dev, char *str, ssize_t len); ...@@ -36,7 +36,7 @@ extern ssize_t of_device_modalias(struct device *dev, char *str, ssize_t len);
extern int of_device_request_module(struct device *dev); extern int of_device_request_module(struct device *dev);
extern void of_device_uevent(const struct device *dev, struct kobj_uevent_env *env); extern void of_device_uevent(const struct device *dev, struct kobj_uevent_env *env);
extern int of_device_uevent_modalias(struct device *dev, struct kobj_uevent_env *env); extern int of_device_uevent_modalias(const struct device *dev, struct kobj_uevent_env *env);
static inline struct device_node *of_cpu_device_node_get(int cpu) static inline struct device_node *of_cpu_device_node_get(int cpu)
{ {
...@@ -83,7 +83,7 @@ static inline int of_device_request_module(struct device *dev) ...@@ -83,7 +83,7 @@ static inline int of_device_request_module(struct device *dev)
return -ENODEV; return -ENODEV;
} }
static inline int of_device_uevent_modalias(struct device *dev, static inline int of_device_uevent_modalias(const struct device *dev,
struct kobj_uevent_env *env) struct kobj_uevent_env *env)
{ {
return -ENODEV; return -ENODEV;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment