Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 620e112c authored by Thomas Renninger's avatar Thomas Renninger Committed by Len Brown
Browse files

ACPI/PNP: A HID value of an object never changes -> make it const 



Signed-off-by: default avatarThomas Renninger <trenn@suse.de>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 2b2ae7c7

drivers/acpi/button.c

+2 −2
Original line number Diff line number Diff line
@@ -338,7 +338,8 @@ static int acpi_button_add(struct acpi_device *device) 
{

	struct acpi_button *button;

	struct input_dev *input;

	char *hid, *name, *class;

	const char *hid = acpi_device_hid(device);

	char *name, *class;

	int error;



	button = kzalloc(sizeof(struct acpi_button), GFP_KERNEL);
@@ -353,7 +354,6 @@ static int acpi_button_add(struct acpi_device *device) 
		goto err_free_button;

	}



	hid = acpi_device_hid(device);

	name = acpi_device_name(device);

	class = acpi_device_class(device);

drivers/acpi/scan.c

+2 −3
Original line number Diff line number Diff line
@@ -26,8 +26,7 @@ extern struct acpi_device *acpi_root; 


#define ACPI_IS_ROOT_DEVICE(device)    (!(device)->parent)



/* Should be const */

static char* dummy_hid = "device";

static const char *dummy_hid = "device";



static LIST_HEAD(acpi_device_list);

static LIST_HEAD(acpi_bus_id_list);
@@ -1021,7 +1020,7 @@ static int acpi_dock_match(struct acpi_device *device) 
	return acpi_get_handle(device->handle, "_DCK", &tmp);

}



char *acpi_device_hid(struct acpi_device *device)

const char *acpi_device_hid(struct acpi_device *device)

{

	struct acpi_hardware_id *hid;

drivers/pnp/base.h

+3 −2
Original line number Diff line number Diff line
@@ -12,11 +12,12 @@ void pnp_unregister_protocol(struct pnp_protocol *protocol); 


#define PNP_EISA_ID_MASK 0x7fffffff

void pnp_eisa_id_to_string(u32 id, char *str);

struct pnp_dev *pnp_alloc_dev(struct pnp_protocol *, int id, char *pnpid);

struct pnp_dev *pnp_alloc_dev(struct pnp_protocol *, int id,

			      const char *pnpid);

struct pnp_card *pnp_alloc_card(struct pnp_protocol *, int id, char *pnpid);



int pnp_add_device(struct pnp_dev *dev);

struct pnp_id *pnp_add_id(struct pnp_dev *dev, char *id);

struct pnp_id *pnp_add_id(struct pnp_dev *dev, const char *id);



int pnp_add_card(struct pnp_card *card);

void pnp_remove_card(struct pnp_card *card);

drivers/pnp/core.c

+2 −1
Original line number Diff line number Diff line
@@ -124,7 +124,8 @@ static void pnp_release_device(struct device *dmdev) 
	kfree(dev);

}



struct pnp_dev *pnp_alloc_dev(struct pnp_protocol *protocol, int id, char *pnpid)

struct pnp_dev *pnp_alloc_dev(struct pnp_protocol *protocol, int id,

			      const char *pnpid)

{

	struct pnp_dev *dev;

	struct pnp_id *dev_id;

drivers/pnp/driver.c

+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ void pnp_unregister_driver(struct pnp_driver *drv) 
 * @dev: pointer to the desired device

 * @id: pointer to an EISA id string

 */

struct pnp_id *pnp_add_id(struct pnp_dev *dev, char *id)

struct pnp_id *pnp_add_id(struct pnp_dev *dev, const char *id)

{

	struct pnp_id *dev_id, *ptr;