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

driver core: make struct device_type.uevent() take a const * 



The uevent() callback in struct device_type should not be modifying the
device that is passed into it, so mark it as a const * and propagate the
function signature changes out into all relevant subsystems that use
this callback.

Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Andreas Noever <andreas.noever@gmail.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Bard Liao <yung-chuan.liao@linux.intel.com>
Cc: Chaitanya Kulkarni <kch@nvidia.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: Frank Rowand <frowand.list@gmail.com>
Cc: Ira Weiny <ira.weiny@intel.com>
Cc: Jason Gunthorpe <jgg@ziepe.ca>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Jilin Yuan <yuanjilin@cdjrlc.com>
Cc: Jiri Slaby <jirislaby@kernel.org>
Cc: Len Brown <lenb@kernel.org>
Cc: Mark Gross <markgross@kernel.org>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>
Cc: Maximilian Luz <luzmaximilian@gmail.com>
Cc: Michael Jamet <michael.jamet@intel.com>
Cc: Ming Lei <ming.lei@redhat.com>
Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Sakari Ailus <sakari.ailus@linux.intel.com>
Cc: Sanyog Kale <sanyog.r.kale@intel.com>
Cc: Sean Young <sean@mess.org>
Cc: Stefan Richter <stefanr@s5r6.in-berlin.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Won Chung <wonchung@google.com>
Cc: Yehezkel Bernat <YehezkelShB@gmail.com>
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com> # for Thunderbolt
Acked-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
Acked-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
Acked-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Acked-by: default avatarWolfram Sang <wsa@kernel.org>
Acked-by: default avatarVinod Koul <vkoul@kernel.org>
Acked-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20230111113018.459199-6-gregkh@linuxfoundation.org


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

block/partitions/core.c

+2 −2
Original line number Diff line number Diff line
@@ -254,9 +254,9 @@ static void part_release(struct device *dev) 
	iput(dev_to_bdev(dev)->bd_inode);

}



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

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

{

	struct block_device *part = dev_to_bdev(dev);

	const struct block_device *part = dev_to_bdev(dev);



	add_uevent_var(env, "PARTN=%u", part->bd_partno);

	if (part->bd_meta_info && part->bd_meta_info->volname[0])

drivers/acpi/device_sysfs.c

+4 −4
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ static void acpi_hide_nondev_subnodes(struct acpi_device_data *data) 
 *         -EINVAL: output error

 *         -ENOMEM: output is truncated

 */

static int create_pnp_modalias(struct acpi_device *acpi_dev, char *modalias,

static int create_pnp_modalias(const struct acpi_device *acpi_dev, char *modalias,

			       int size)

{

	int len;
@@ -191,7 +191,7 @@ static int create_pnp_modalias(struct acpi_device *acpi_dev, char *modalias, 
 * only be called for devices having ACPI_DT_NAMESPACE_HID in their list of

 * ACPI/PNP IDs.

 */

static int create_of_modalias(struct acpi_device *acpi_dev, char *modalias,

static int create_of_modalias(const struct acpi_device *acpi_dev, char *modalias,

			      int size)

{

	struct acpi_buffer buf = { ACPI_ALLOCATE_BUFFER };
@@ -239,7 +239,7 @@ static int create_of_modalias(struct acpi_device *acpi_dev, char *modalias, 
	return len;

}



int __acpi_device_uevent_modalias(struct acpi_device *adev,

int __acpi_device_uevent_modalias(const struct acpi_device *adev,

				  struct kobj_uevent_env *env)

{

	int len;
@@ -277,7 +277,7 @@ int __acpi_device_uevent_modalias(struct acpi_device *adev, 
 * Because other buses do not support ACPI HIDs & CIDs, e.g. for a device with

 * hid:IBM0001 and cid:ACPI0001 you get: "acpi:IBM0001:ACPI0001".

 */

int acpi_device_uevent_modalias(struct device *dev, struct kobj_uevent_env *env)

int acpi_device_uevent_modalias(const struct device *dev, struct kobj_uevent_env *env)

{

	return __acpi_device_uevent_modalias(acpi_companion_match(dev), env);

}

drivers/acpi/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ int acpi_bus_register_early_device(int type); 
                     Device Matching and Notification

   -------------------------------------------------------------------------- */

struct acpi_device *acpi_companion_match(const struct device *dev);

int __acpi_device_uevent_modalias(struct acpi_device *adev,

int __acpi_device_uevent_modalias(const struct acpi_device *adev,

				  struct kobj_uevent_env *env);



/* --------------------------------------------------------------------------

drivers/firewire/core-device.c

+4 −4
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ static void get_ids(const u32 *directory, int *id) 
	}

}



static void get_modalias_ids(struct fw_unit *unit, int *id)

static void get_modalias_ids(const struct fw_unit *unit, int *id)

{

	get_ids(&fw_parent_device(unit)->config_rom[5], id);

	get_ids(unit->directory, id);
@@ -195,7 +195,7 @@ static void fw_unit_remove(struct device *dev) 
	driver->remove(fw_unit(dev));

}



static int get_modalias(struct fw_unit *unit, char *buffer, size_t buffer_size)

static int get_modalias(const struct fw_unit *unit, char *buffer, size_t buffer_size)

{

	int id[] = {0, 0, 0, 0};
@@ -206,9 +206,9 @@ static int get_modalias(struct fw_unit *unit, char *buffer, size_t buffer_size) 
			id[0], id[1], id[2], id[3]);

}



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

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

{

	struct fw_unit *unit = fw_unit(dev);

	const struct fw_unit *unit = fw_unit(dev);

	char modalias[64];



	get_modalias(unit, modalias, sizeof(modalias));

drivers/gpu/drm/display/drm_dp_aux_bus.c

+1 −1
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ static void dp_aux_ep_dev_release(struct device *dev) 
	kfree(aux_ep_with_data);

}



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

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

{

	return of_device_uevent_modalias(dev, env);

}