Skip to content

Commit ccae53a

Browse files
rbmarliereDominik Brodowski
authored andcommitted
pcmcia: cs: make pcmcia_socket_class constant
Since commit 43a7206 ("driver core: class: make class_register() take a const *"), the driver core allows for struct class to be in read-only memory, so move the pcmcia_socket_class structure to be declared at build time placing it into read-only memory, instead of having to be dynamically allocated at boot time. Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Suggested-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Ricardo B. Marliere <ricardo@marliere.net> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
1 parent 1bec769 commit ccae53a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

drivers/pcmcia/cs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -892,7 +892,7 @@ static const struct dev_pm_ops pcmcia_socket_pm_ops = {
892892

893893
#endif /* CONFIG_PM */
894894

895-
struct class pcmcia_socket_class = {
895+
const struct class pcmcia_socket_class = {
896896
.name = "pcmcia_socket",
897897
.dev_uevent = pcmcia_socket_uevent,
898898
.dev_release = pcmcia_release_socket,

drivers/pcmcia/cs_internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ struct pcmcia_callback{
113113
/* cs.c */
114114
extern struct rw_semaphore pcmcia_socket_list_rwsem;
115115
extern struct list_head pcmcia_socket_list;
116-
extern struct class pcmcia_socket_class;
116+
extern const struct class pcmcia_socket_class;
117117

118118
int pccard_register_pcmcia(struct pcmcia_socket *s, struct pcmcia_callback *c);
119119
struct pcmcia_socket *pcmcia_get_socket_by_nr(unsigned int nr);

0 commit comments

Comments
 (0)