github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-04 12:35:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

PCMCIA: improvements for v6.9-rc1

Browse Source 
Ricardo B. Marliere updated the PCMCIA intrastructure to make
 use the driver core now allowing some structs to be const.
 -----BEGIN PGP SIGNATURE-----
 
 iQJPBAABCAA5FiEEmgXaWKgmjrvkPhLCmpdgiUyNow0FAmX2mGIbHGxpbnV4QGRv
 bWluaWticm9kb3dza2kubmV0AAoJEJqXYIlMjaMNFzIP/AguU/9QUjhQ4dpPF2J4
 FkIkolV2WTppncOCq5UKXyKXQmD0FKpYVvMozc+/WEXcwC/jf0BDd6cfbRCX4Aba
 A1JIl+Q4jtF1DNTgP9kSQUpz9NhVcZjJBeu63wJn58QRtLTv/Q7i/c5UQmG0a8jw
 8+bz6lqLTe/BDFsLNm4ZtRZiFVBoPo0FTh2f0GwOtkFM6diyHqmPioStU2dXBmh7
 ZGgwBaJ8KZP2m9aiXLk6OuhX3AnA7EbMelrelW9L01V0xAkihy6QR3eoUu5eVDtt
 N0Br0kG6GFNhmWmSRvBoWjfHf6a2rnfLmXo4exKtWuZ55GSs7ozETOwlCGV1qYuQ
 9//6DFkODjo/TDuivecCE1/sCBe09PW53OwVvpVw5+zjlA3N68ikMnaMva1uuzTi
 cJITO3Sprk6VcUKkuI8QL33ueyIYdc09ndYtgb7LmLJL72rA0CvPc+zdzXLQpo+n
 l06RKkgRhVB3qVrlVfN+hTIqUXLjXsooO9UD9wHrOSff/Jhx3pGOFOFbtCXHMA8M
 IdQHF2EbNwROLd6DK5QvvVuOdEHdVIItqxfloxsOzLCWNeNC1DHFPLwHjqo78a3L
 22idVYTglNtAX5v2kig0qH0GXza+o+ocv21xqPvgTYsmaysVp8O5HZQKiqA2vmFg
 1v9gYzUMHofvGC95k4ldJsLj
 =u6WU
 -----END PGP SIGNATURE-----

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:
Linus Torvalds 2024-03-17 12:02:21 -07:00
commit 75e41d42cc
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/pcmcia/cs.c
View File

@ -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,

4
drivers/pcmcia/cs_internal.h
View File

@ -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;

2
drivers/pcmcia/ds.c
View File

@ -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,