Skip to content

Commit 09ea808

Browse files
torvaldstorvalds
committed
Merge tag 'staging-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging driver updates from Greg KH: "This is the "big" staging driver update for 6.11-rc1. Not really all that much happened this release cycle, just lots of tiny cleanups, overall about 3000 lines removed, so the cleanups were worth it. Included in here are: - loads of rtl8723bs driver cleanups - lots of rtl8192e driver cleanups - vc04_services reworks and cleanups as that codebase gets slowly evolved into something that will make it into the "real" part of the kernel hopefully soon. - other tiny staging driver cleanups All of these have been in linux-next for a while with no reported issues" * tag 'staging-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (124 commits) staging: rtl8723bs: Remove constant result function CheckNegative() staging: rtl8723bs: Remove unused macros in rtw_mlme_ext.h staging: rtl8723bs: Remove unused macros in hal_pwr_seq.h staging: rtl8723bs: Remove unused macros in rtw_efuse.h staging: rtl8723bs: Remove unused macros in rtw_mlme.h staging: rtl8723bs: Remove unused macros in HalPwrSeqCmd.h staging: rtl8723bs: Remove unused macros in Hal8723BReg.h staging: rtl8723bs: Remove unused macros in Hal8192CPhyReg.h staging: rtl8723bs: Delete file hal_phy_reg_8723b.h staging: rtl8723bs: Move last macro from hal_phy_reg_8723b.h staging: rtl8723bs: Remove unused macros in hal_phy_reg_8723b.h staging: rtl8723bs: Remove unused macros in hal_com_reg.h staging: rtl8723bs: Remove unused macros in rtw_ht.h staging: rtl8723bs: Remove unused macros in hal_com_h2c.h staging: vc04_services: vchiq_core: Stop kthreads on vchiq module unload staging: vchiq_core: Bubble up wait_event_interruptible() return value staging: nvec: Use x instead of x != NULL to improve readability. staging: rtl8192e: Fix conflicting types error with net_device. staging: rtl8723bs: Remove unused variable pwdev_priv staging: vc04_services: Update testing instructions ...
2 parents 04d1733 + 104e004 commit 09ea808

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+616
-3622
lines changed

‎drivers/staging/fbtft/fbtft-core.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1276,4 +1276,5 @@ void fbtft_remove_common(struct device *dev, struct fb_info *info)
12761276
}
12771277
EXPORT_SYMBOL(fbtft_remove_common);
12781278

1279+
MODULE_DESCRIPTION("Core FB support for small TFT LCD display modules");
12791280
MODULE_LICENSE("GPL");

‎drivers/staging/greybus/audio_manager.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,5 +182,6 @@ static void __exit manager_exit(void)
182182
module_init(manager_init);
183183
module_exit(manager_exit);
184184

185+
MODULE_DESCRIPTION("Greybus audio operations manager");
185186
MODULE_LICENSE("GPL");
186187
MODULE_AUTHOR("Svetlin Ankov <[email protected]>");

‎drivers/staging/greybus/audio_topology.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,6 @@
1010

1111
#define GBAUDIO_INVALID_ID 0xFF
1212

13-
/* mixer control */
14-
struct gb_mixer_control {
15-
int min, max;
16-
unsigned int reg, rreg, shift, rshift, invert;
17-
};
18-
1913
struct gbaudio_ctl_pvt {
2014
unsigned int ctl_id;
2115
unsigned int data_cport;

‎drivers/staging/greybus/bootrom.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -522,4 +522,5 @@ static struct greybus_driver gb_bootrom_driver = {
522522

523523
module_greybus_driver(gb_bootrom_driver);
524524

525+
MODULE_DESCRIPTION("BOOTROM Greybus driver");
525526
MODULE_LICENSE("GPL v2");

‎drivers/staging/greybus/camera.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1374,4 +1374,5 @@ static struct greybus_driver gb_camera_driver = {
13741374

13751375
module_greybus_driver(gb_camera_driver);
13761376

1377+
MODULE_DESCRIPTION("Greybus Camera protocol driver.");
13771378
MODULE_LICENSE("GPL v2");

‎drivers/staging/greybus/gbphy.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,4 +354,5 @@ static void __exit gbphy_exit(void)
354354
}
355355
module_exit(gbphy_exit);
356356

357+
MODULE_DESCRIPTION("Greybus Bridged-Phy Bus driver");
357358
MODULE_LICENSE("GPL v2");

‎drivers/staging/greybus/gpio.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -631,4 +631,5 @@ static struct gbphy_driver gpio_driver = {
631631
};
632632

633633
module_gbphy_driver(gpio_driver);
634+
MODULE_DESCRIPTION("GPIO Greybus driver");
634635
MODULE_LICENSE("GPL v2");

‎drivers/staging/greybus/hid.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -516,4 +516,5 @@ static struct greybus_driver gb_hid_driver = {
516516
};
517517
module_greybus_driver(gb_hid_driver);
518518

519+
MODULE_DESCRIPTION("HID class driver for the Greybus");
519520
MODULE_LICENSE("GPL v2");

‎drivers/staging/greybus/i2c.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -318,4 +318,5 @@ static struct gbphy_driver i2c_driver = {
318318
};
319319

320320
module_gbphy_driver(i2c_driver);
321+
MODULE_DESCRIPTION("I2C bridge driver for the Greybus 'generic' I2C module");
321322
MODULE_LICENSE("GPL v2");

‎drivers/staging/greybus/light.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1339,4 +1339,5 @@ static struct greybus_driver gb_lights_driver = {
13391339
};
13401340
module_greybus_driver(gb_lights_driver);
13411341

1342+
MODULE_DESCRIPTION("Greybus Lights protocol driver");
13421343
MODULE_LICENSE("GPL v2");

0 commit comments

Comments
 (0)