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.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

Linus Torvalds 71bed1ec fd71b9a0

+8 -4
-1
drivers/pcmcia/bcm63xx_pcmcia.c
··· 456 456 .remove_new = bcm63xx_drv_pcmcia_remove, 457 457 .driver = { 458 458 .name = "bcm63xx_pcmcia", 459 - .owner = THIS_MODULE, 460 459 }, 461 460 }; 462 461
+1
drivers/pcmcia/i82092.c
··· 23 23 #include "i82092aa.h" 24 24 #include "i82365.h" 25 25 26 + MODULE_DESCRIPTION("Driver for Intel I82092AA PCI-PCMCIA bridge"); 26 27 MODULE_LICENSE("GPL"); 27 28 28 29 /* PCI core routines */
+1
drivers/pcmcia/i82365.c
··· 1342 1342 1343 1343 module_init(init_i82365); 1344 1344 module_exit(exit_i82365); 1345 + MODULE_DESCRIPTION("Driver for Intel 82365 and compatible PC Card controllers"); 1345 1346 MODULE_LICENSE("Dual MPL/GPL"); 1346 1347 /*====================================================================*/
+1
drivers/pcmcia/max1600.c
··· 119 119 } 120 120 EXPORT_SYMBOL_GPL(max1600_configure); 121 121 122 + MODULE_DESCRIPTION("MAX1600 PCMCIA power switch library"); 122 123 MODULE_LICENSE("GPL v2");
+1
drivers/pcmcia/rsrc_mgr.c
··· 66 66 67 67 68 68 MODULE_AUTHOR("David A. Hinds, Dominik Brodowski"); 69 + MODULE_DESCRIPTION("PCMCIA resource management routines"); 69 70 MODULE_LICENSE("GPL"); 70 71 MODULE_ALIAS("rsrc_nonstatic");
+4 -3
drivers/pcmcia/yenta_socket.c
··· 638 638 start = PCIBIOS_MIN_CARDBUS_IO; 639 639 end = ~0U; 640 640 } else { 641 - unsigned long avail = root->end - root->start; 641 + unsigned long avail = resource_size(root); 642 642 int i; 643 643 size = BRIDGE_MEM_MAX; 644 - if (size > avail/8) { 645 - size = (avail+1)/8; 644 + if (size > (avail - 1) / 8) { 645 + size = avail / 8; 646 646 /* round size down to next power of 2 */ 647 647 i = 0; 648 648 while ((size /= 2) != 0) ··· 1452 1452 1453 1453 module_pci_driver(yenta_cardbus_driver); 1454 1454 1455 + MODULE_DESCRIPTION("Driver for CardBus yenta-compatible bridges"); 1455 1456 MODULE_LICENSE("GPL");