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
This commit is contained in:
+1
-1
@@ -892,7 +892,7 @@ static const struct dev_pm_ops pcmcia_socket_pm_ops = {
|
||||
|
||||
#endif /* CONFIG_PM */
|
||||
|
||||
struct class pcmcia_socket_class = {
|
||||
const struct class pcmcia_socket_class = {
|
||||
.name = "pcmcia_socket",
|
||||
.dev_uevent = pcmcia_socket_uevent,
|
||||
.dev_release = pcmcia_release_socket,
|
||||
|
||||
@@ -113,7 +113,7 @@ struct pcmcia_callback{
|
||||
/* cs.c */
|
||||
extern struct rw_semaphore pcmcia_socket_list_rwsem;
|
||||
extern struct list_head pcmcia_socket_list;
|
||||
extern struct class pcmcia_socket_class;
|
||||
extern const struct class pcmcia_socket_class;
|
||||
|
||||
int pccard_register_pcmcia(struct pcmcia_socket *s, struct pcmcia_callback *c);
|
||||
struct pcmcia_socket *pcmcia_get_socket_by_nr(unsigned int nr);
|
||||
@@ -132,7 +132,7 @@ void pcmcia_put_socket(struct pcmcia_socket *skt);
|
||||
* Stuff internal to module "pcmcia".
|
||||
*/
|
||||
/* ds.c */
|
||||
extern struct bus_type pcmcia_bus_type;
|
||||
extern const struct bus_type pcmcia_bus_type;
|
||||
|
||||
struct pcmcia_device;
|
||||
|
||||
|
||||
+1
-1
@@ -1406,7 +1406,7 @@ static const struct dev_pm_ops pcmcia_bus_pm_ops = {
|
||||
SET_SYSTEM_SLEEP_PM_OPS(pcmcia_dev_suspend, pcmcia_dev_resume)
|
||||
};
|
||||
|
||||
struct bus_type pcmcia_bus_type = {
|
||||
const struct bus_type pcmcia_bus_type = {
|
||||
.name = "pcmcia",
|
||||
.uevent = pcmcia_bus_uevent,
|
||||
.match = pcmcia_bus_match,
|
||||
|
||||
Reference in New Issue
Block a user