Commit fa627348 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

driver core: class: make namespace and get_ownership take const * 

The callbacks in struct class namespace() and get_ownership() do not
modify the struct device passed to them, so mark the pointer as constant
and fix up all callbacks in the kernel to have the correct function
signature.

This helps make it more obvious what calls and callbacks do, and do not,
modify structures passed to them.

Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Link: https://lore.kernel.org/r/20221001165426.2690912-1-gregkh@linuxfoundation.org


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

drivers/base/core.c

+2 −2
Original line number Diff line number Diff line
@@ -2336,7 +2336,7 @@ static void device_release(struct kobject *kobj) 


static const void *device_namespace(struct kobject *kobj)

{

	struct device *dev = kobj_to_dev(kobj);

	const struct device *dev = kobj_to_dev(kobj);

	const void *ns = NULL;



	if (dev->class && dev->class->ns_type)
@@ -2347,7 +2347,7 @@ static const void *device_namespace(struct kobject *kobj) 


static void device_get_ownership(struct kobject *kobj, kuid_t *uid, kgid_t *gid)

{

	struct device *dev = kobj_to_dev(kobj);

	const struct device *dev = kobj_to_dev(kobj);



	if (dev->class && dev->class->get_ownership)

		dev->class->get_ownership(dev, uid, gid);

drivers/infiniband/core/device.c

+2 −2
Original line number Diff line number Diff line
@@ -524,9 +524,9 @@ static int ib_device_uevent(struct device *device, 
	return 0;

}



static const void *net_namespace(struct device *d)

static const void *net_namespace(const struct device *d)

{

	struct ib_core_device *coredev =

	const struct ib_core_device *coredev =

			container_of(d, struct ib_core_device, dev);



	return read_pnet(&coredev->rdma_net);

drivers/net/ipvlan/ipvtap.c

+2 −2
Original line number Diff line number Diff line
@@ -30,9 +30,9 @@ 
static dev_t ipvtap_major;

static struct cdev ipvtap_cdev;



static const void *ipvtap_net_namespace(struct device *d)

static const void *ipvtap_net_namespace(const struct device *d)

{

	struct net_device *dev = to_net_dev(d->parent);

	const struct net_device *dev = to_net_dev(d->parent);

	return dev_net(dev);

}

drivers/net/macvtap.c

+2 −2
Original line number Diff line number Diff line
@@ -35,9 +35,9 @@ struct macvtap_dev { 
 */

static dev_t macvtap_major;



static const void *macvtap_net_namespace(struct device *d)

static const void *macvtap_net_namespace(const struct device *d)

{

	struct net_device *dev = to_net_dev(d->parent);

	const struct net_device *dev = to_net_dev(d->parent);

	return dev_net(dev);

}

include/linux/device/class.h

+2 −2
Original line number Diff line number Diff line
@@ -68,9 +68,9 @@ struct class { 
	int (*shutdown_pre)(struct device *dev);



	const struct kobj_ns_type_operations *ns_type;

	const void *(*namespace)(struct device *dev);

	const void *(*namespace)(const struct device *dev);



	void (*get_ownership)(struct device *dev, kuid_t *uid, kgid_t *gid);

	void (*get_ownership)(const struct device *dev, kuid_t *uid, kgid_t *gid);



	const struct dev_pm_ops *pm;