Skip to content

Commit

Permalink
pcmcia: Make declaration and uses of struct pcmcia_device_id const
Browse files Browse the repository at this point in the history
Const allows tables to be moved into text sections.

Signed-off-by: Joe Perches <[email protected]>
Signed-off-by: Dominik Brodowski <[email protected]>
  • Loading branch information
JoePerches authored and Dominik Brodowski committed May 6, 2011
1 parent 37fac4b commit e9fb13b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions drivers/pcmcia/ds.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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))
Expand Down Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion include/pcmcia/ds.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
Expand Down

0 comments on commit e9fb13b

Please sign in to comment.