tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'pcmcia-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux

Pull PCMCIA updates from Dominik Brodowski:
"Mark some structs 'const' now that the driver core supports it
(Ricardo B Marliere)"

* tag 'pcmcia-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux:
pcmcia: cs: make pcmcia_socket_class constant
pcmcia: ds: make pcmcia_bus_type const

Linus Torvalds 75e41d42 6885d726

+4 -4
+1 -1
drivers/pcmcia/cs.c
··· 892 892 893 893 #endif /* CONFIG_PM */ 894 894 895 - struct class pcmcia_socket_class = { 895 + const struct class pcmcia_socket_class = { 896 896 .name = "pcmcia_socket", 897 897 .dev_uevent = pcmcia_socket_uevent, 898 898 .dev_release = pcmcia_release_socket,
+2 -2
drivers/pcmcia/cs_internal.h
··· 113 113 /* cs.c */ 114 114 extern struct rw_semaphore pcmcia_socket_list_rwsem; 115 115 extern struct list_head pcmcia_socket_list; 116 - extern struct class pcmcia_socket_class; 116 + extern const struct class pcmcia_socket_class; 117 117 118 118 int pccard_register_pcmcia(struct pcmcia_socket *s, struct pcmcia_callback *c); 119 119 struct pcmcia_socket *pcmcia_get_socket_by_nr(unsigned int nr); ··· 132 132 * Stuff internal to module "pcmcia". 133 133 */ 134 134 /* ds.c */ 135 - extern struct bus_type pcmcia_bus_type; 135 + extern const struct bus_type pcmcia_bus_type; 136 136 137 137 struct pcmcia_device; 138 138
+1 -1
drivers/pcmcia/ds.c
··· 1406 1406 SET_SYSTEM_SLEEP_PM_OPS(pcmcia_dev_suspend, pcmcia_dev_resume) 1407 1407 }; 1408 1408 1409 - struct bus_type pcmcia_bus_type = { 1409 + const struct bus_type pcmcia_bus_type = { 1410 1410 .name = "pcmcia", 1411 1411 .uevent = pcmcia_bus_uevent, 1412 1412 .match = pcmcia_bus_match,