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

Commit e9fb13bf authored by Joe Perches's avatar Joe Perches Committed by Dominik Brodowski
Browse files

pcmcia: Make declaration and uses of struct pcmcia_device_id const 



Const allows tables to be moved into text sections.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 37fac4b6

drivers/pcmcia/ds.c

+3 −3
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ MODULE_LICENSE("GPL"); 


static void pcmcia_check_driver(struct pcmcia_driver *p_drv)

{

	struct pcmcia_device_id *did = p_drv->id_table;

	const struct pcmcia_device_id *did = p_drv->id_table;

	unsigned int i;

	u32 hash;
@@ -784,7 +784,7 @@ static inline int pcmcia_load_firmware(struct pcmcia_device *dev, char * filenam 




static inline int pcmcia_devmatch(struct pcmcia_device *dev,

				  struct pcmcia_device_id *did)

				  const struct pcmcia_device_id *did)

{

	if (did->match_flags & PCMCIA_DEV_ID_MATCH_MANF_ID) {

		if ((!dev->has_manf_id) || (dev->manf_id != did->manf_id))
@@ -890,7 +890,7 @@ static int pcmcia_bus_match(struct device *dev, struct device_driver *drv) 
{

	struct pcmcia_device *p_dev = to_pcmcia_dev(dev);

	struct pcmcia_driver *p_drv = to_pcmcia_drv(drv);

	struct pcmcia_device_id *did = p_drv->id_table;

	const struct pcmcia_device_id *did = p_drv->id_table;

	struct pcmcia_dynid *dynid;



	/* match dynamic devices first */

include/pcmcia/ds.h

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ struct pcmcia_driver { 
	int (*resume)		(struct pcmcia_device *dev);



	struct module		*owner;

	struct pcmcia_device_id	*id_table;

	const struct pcmcia_device_id	*id_table;

	struct device_driver	drv;

	struct pcmcia_dynids	dynids;

};