iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PCMCIA: improvements for v6.11-rc1

Browse Source 
A number of tiny cleanups of the PCMCIA subsystem by Jeff Johnson,
 Jules Irenge, and Krzysztof Kozlowski.
 -----BEGIN PGP SIGNATURE-----
 
 iQJPBAABCAA5FiEEmgXaWKgmjrvkPhLCmpdgiUyNow0FAmaeqv8bHGxpbnV4QGRv
 bWluaWticm9kb3dza2kubmV0AAoJEJqXYIlMjaMNvv4P/1oHh6odH9EVTlnVPAGb
 BY+oRMCooVDqHZBhKQHURPQ9FcGXUArmQUxp212qugUTQNHgfgQbDsN4YpnLvCe9
 1M5QSLuWBqFv1YkZDpWf13HZ/cVycA3FSYYz2GC2RtXLeAhAkh97q634gEAxsFQ3
 DOutFbP9GzBP7F16gmGth6AXEwCZdHTXymfcZ6zu+b8cirmDzVFtpWMaAyILXngV
 LD0IzZ9/gl04va/Zztc6GkFnHtHO8ar83DDiZRr5kmQtLEchQJgvlaqa6XnlTFTd
 66yCFuI7YkSgIil/qVFWS7eZ7yBzNQNM8GxWTbXXa5ORp8TATvFeAl/JM+Vv7EXW
 MxRDWc+PAIsp3Gf+EWP5ooTk1Cg7bTMlPhvsSm8qT0QQ9FNW+jNj9toTigSfAQ/q
 tljxKTajA90oFlsh0Fp/JcgNJrNsn5gk/1ZfDn4zqlLq2Zw4UrIxguJNcDs8+kk+
 KlvpTmzNFvALhiIetXXm0AifMPfLlNwpqI8nbMOWd+LqQBZLHHl9kq4plpxeoUx7
 gg7ORAayIYYI345jMDdTYGlLYj2WB1QO7kKpmpRFPaiar5CGmm5jPhu8eEkAB27B
 YlcP/vtZRL3MXrhN8+AWTF0+WE94wymknAhOtX6xXGcz6Ybs/2np7g46eBxYE/au
 vHXFFzX9deg/AHbkZuRsZxvr
 =JwCl
 -----END PGP SIGNATURE-----

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

Pull PCMCIA updates from Dominik Brodowski:
 "A number of tiny cleanups of the PCMCIA subsystem by Jeff Johnson,
  Jules Irenge, and Krzysztof Kozlowski"

* tag 'pcmcia-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux:
  pcmcia: add missing MODULE_DESCRIPTION() macros
  pcmcia: Use resource_size function on resource object
  pcmcia: bcm63xx: drop driver owner assignment
This commit is contained in:
Linus Torvalds 2024-07-23 09:46:17 -07:00
commit 71bed1ec0f
6 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/pcmcia/bcm63xx_pcmcia.c
View File

@ -456,7 +456,6 @@ struct platform_driver bcm63xx_pcmcia_driver = {
.remove_new = bcm63xx_drv_pcmcia_remove,
.driver = {
.name = "bcm63xx_pcmcia",
.owner = THIS_MODULE,
},
};

1
drivers/pcmcia/i82092.c
View File

@ -23,6 +23,7 @@
#include "i82092aa.h"
#include "i82365.h"
MODULE_DESCRIPTION("Driver for Intel I82092AA PCI-PCMCIA bridge");
MODULE_LICENSE("GPL");
/* PCI core routines */

1
drivers/pcmcia/i82365.c
View File

@ -1342,5 +1342,6 @@ static void __exit exit_i82365(void)
module_init(init_i82365);
module_exit(exit_i82365);
MODULE_DESCRIPTION("Driver for Intel 82365 and compatible PC Card controllers");
MODULE_LICENSE("Dual MPL/GPL");
/*====================================================================*/

1
drivers/pcmcia/max1600.c
View File

@ -119,4 +119,5 @@ int max1600_configure(struct max1600 *m, unsigned int vcc, unsigned int vpp)
}
EXPORT_SYMBOL_GPL(max1600_configure);
MODULE_DESCRIPTION("MAX1600 PCMCIA power switch library");
MODULE_LICENSE("GPL v2");

1
drivers/pcmcia/rsrc_mgr.c
View File

@ -66,5 +66,6 @@ EXPORT_SYMBOL(pccard_static_ops);
MODULE_AUTHOR("David A. Hinds, Dominik Brodowski");
MODULE_DESCRIPTION("PCMCIA resource management routines");
MODULE_LICENSE("GPL");
MODULE_ALIAS("rsrc_nonstatic");

7
drivers/pcmcia/yenta_socket.c
View File

@ -638,11 +638,11 @@ static int yenta_search_one_res(struct resource *root, struct resource *res,
start = PCIBIOS_MIN_CARDBUS_IO;
end = ~0U;
} else {
unsigned long avail = root->end - root->start;
unsigned long avail = resource_size(root);
int i;
size = BRIDGE_MEM_MAX;
if (size > avail/8) {
size = (avail+1)/8;
if (size > (avail - 1) / 8) {
size = avail / 8;
/* round size down to next power of 2 */
i = 0;
while ((size /= 2) != 0)
@ -1452,4 +1452,5 @@ static struct pci_driver yenta_cardbus_driver = {
module_pci_driver(yenta_cardbus_driver);
MODULE_DESCRIPTION("Driver for CardBus yenta-compatible bridges");
MODULE_LICENSE("GPL");