Skip to content

Commit 4c7a0c9

Browse files
torvaldstorvalds
committed
Merge tag 'staging-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging driver updates from Greg KH: "Here is the big set of staging driver updates for 6.7-rc1. A bit bigger than 6.6 this time around, as it coincided with the Outreachy and mentorship application process, so we got a bunch of new developers sending in their first changes, which is nice to see. Also in here is a removal of the qlge ethernet driver, and the rtl8192u wireless driver. Both of these were very old and no one was maintaining them, the wireless driver removal was due to no one using it anymore, and no hardware to be found, and is part of a larger effort to remove unused and old wifi drivers from the system. The qlge ethernet driver did have one user pop up after it was dropped, and we are working with the network mainainers to figure out what tree it will come back in from and who will be responsible for it, and if it really is being used or not. Odds are it will show up in a network subsystem pull request after -rc1 is out, but we aren't sure yet. Other smaller changes in here are: - Lots of vc04_services work by Umang to clean up the mess created by the rpi developers long ago, bringing it almost into good enough shape to get out of staging, hopefully next major release, it's getting close. - rtl8192e variable cleanups and removal of unused code and structures - vme_user coding style cleanups - other small coding style cleanups to lots of the staging drivers - octeon typedef removals, and then last-minute revert when it was found to break the build in some configurations (it's a hard driver to build properly, none of the normal automated testing catches it.) All of these have been in linux-next for a while with no reported issues" * tag 'staging-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (256 commits) Revert "staging: octeon: remove typedef in enum cvmx_spi_mode_t" Revert "staging: octeon: remove typedef in enum cvmx_helper_interface_mode_t" Revert "staging: octeon: remove typedef in enum cvmx_pow_wait_t" Revert "staging: octeon: remove typedef in struct cvmx_pko_lock_t" Revert "staging: octeon: remove typedef in enum cvmx_pko_status_t" Revert "staging: octeon: remove typedef in structs cvmx_pip_port_status_t and cvmx_pko_port_status_t" staging: vt6655: Type encoding info dropped from variable name "byRxRate" staging: vt6655: Type encoding info dropped from function name "CARDbUpdateTSF" staging: vt6655: Type encoding info dropped from function name "CARDvSetRSPINF" staging: vt6655: Type encoding info dropped from function name "CARDbyGetPktType" staging: vt6655: Type encoding info dropped from variable name "byPacketType" staging: vt6655: Type encoding info dropped from function name "CARDbSetPhyParameter" staging: vt6655: Type encoding info dropped from variable name "pbyRsvTime" staging: vt6655: Type encoding info dropped from variable name "pbyTxRate" staging: vt6655: Type encoding info dropped from function name "s_vCalculateOFDMRParameter" staging: vt6655: Type encoding info dropped from array name "cwRXBCNTSFOff" staging: fbtft: Convert to platform remove callback returning void staging: olpc_dcon: Remove I2C_CLASS_DDC support staging: vc04_services: use snprintf instead of sprintf staging: rtl8192e: Fix line break issue at priv->rx_buf[priv->rx_idx] ...
2 parents b06f58a + a4000df commit 4c7a0c9

File tree

152 files changed

+2659
-45337
lines changed

Some content is hidden

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

152 files changed

+2659
-45337
lines changed

‎Documentation/networking/device_drivers/index.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ Contents:
1515
ethernet/index
1616
fddi/index
1717
hamradio/index
18-
qlogic/index
1918
wifi/index
2019
wwan/index
2120

‎Documentation/networking/device_drivers/qlogic/index.rst

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎Documentation/networking/device_drivers/qlogic/qlge.rst

Lines changed: 0 additions & 118 deletions
This file was deleted.

‎MAINTAINERS

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17673,15 +17673,6 @@ L: [email protected]
1767317673
S: Supported
1767417674
F: drivers/net/ethernet/qlogic/qlcnic/
1767517675

17676-
QLOGIC QLGE 10Gb ETHERNET DRIVER
17677-
M: Manish Chopra <[email protected]>
17678-
M: [email protected]
17679-
M: Coiby Xu <[email protected]>
17680-
L: [email protected]
17681-
S: Supported
17682-
F: Documentation/networking/device_drivers/qlogic/qlge.rst
17683-
F: drivers/staging/qlge/
17684-
1768517676
QM1D1B0004 MEDIA DRIVER
1768617677
M: Akihiro Tsukada <[email protected]>
1768717678
L: [email protected]

‎arch/parisc/configs/generic-64bit_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,6 @@ CONFIG_UIO_AEC=m
248248
CONFIG_UIO_SERCOS3=m
249249
CONFIG_UIO_PCI_GENERIC=m
250250
CONFIG_STAGING=y
251-
CONFIG_QLGE=m
252251
CONFIG_EXT2_FS=y
253252
CONFIG_EXT2_FS_XATTR=y
254253
CONFIG_EXT2_FS_SECURITY=y

‎drivers/staging/Kconfig

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ source "drivers/staging/wlan-ng/Kconfig"
2828

2929
source "drivers/staging/olpc_dcon/Kconfig"
3030

31-
source "drivers/staging/rtl8192u/Kconfig"
32-
3331
source "drivers/staging/rtl8192e/Kconfig"
3432

3533
source "drivers/staging/rtl8723bs/Kconfig"
@@ -74,8 +72,6 @@ source "drivers/staging/axis-fifo/Kconfig"
7472

7573
source "drivers/staging/fieldbus/Kconfig"
7674

77-
source "drivers/staging/qlge/Kconfig"
78-
7975
source "drivers/staging/vme_user/Kconfig"
8076

8177
endif # STAGING

‎drivers/staging/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
obj-y += media/
55
obj-$(CONFIG_PRISM2_USB) += wlan-ng/
66
obj-$(CONFIG_FB_OLPC_DCON) += olpc_dcon/
7-
obj-$(CONFIG_RTL8192U) += rtl8192u/
87
obj-$(CONFIG_RTL8192E) += rtl8192e/
98
obj-$(CONFIG_RTL8723BS) += rtl8723bs/
109
obj-$(CONFIG_R8712U) += rtl8712/
@@ -27,4 +26,3 @@ obj-$(CONFIG_BCM2835_VCHIQ) += vc04_services/
2726
obj-$(CONFIG_PI433) += pi433/
2827
obj-$(CONFIG_XIL_AXIS_FIFO) += axis-fifo/
2928
obj-$(CONFIG_FIELDBUS_DEV) += fieldbus/
30-
obj-$(CONFIG_QLGE) += qlge/

‎drivers/staging/fbtft/fbtft.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -310,12 +310,11 @@ static int fbtft_driver_probe_pdev(struct platform_device *pdev) \
310310
return fbtft_probe_common(_display, NULL, pdev); \
311311
} \
312312
\
313-
static int fbtft_driver_remove_pdev(struct platform_device *pdev) \
313+
static void fbtft_driver_remove_pdev(struct platform_device *pdev) \
314314
{ \
315315
struct fb_info *info = platform_get_drvdata(pdev); \
316316
\
317317
fbtft_remove_common(&pdev->dev, info); \
318-
return 0; \
319318
} \
320319
\
321320
FBTFT_DT_TABLE(_compatible) \
@@ -329,7 +328,7 @@ static struct platform_driver fbtft_driver_platform_driver = { \
329328
.of_match_table = dt_ids, \
330329
}, \
331330
.probe = fbtft_driver_probe_pdev, \
332-
.remove = fbtft_driver_remove_pdev, \
331+
.remove_new = fbtft_driver_remove_pdev, \
333332
}; \
334333
\
335334
static int __init fbtft_driver_module_init(void) \

‎drivers/staging/fieldbus/anybuss/arcx-anybus.c

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,10 @@ static const struct regulator_desc can_power_desc = {
218218
.ops = &can_power_ops,
219219
};
220220

221-
static struct class *controller_class;
221+
static const struct class controller_class = {
222+
.name = "arcx_anybus_controller",
223+
};
224+
222225
static DEFINE_IDA(controller_index_ida);
223226

224227
static int controller_probe(struct platform_device *pdev)
@@ -301,7 +304,7 @@ static int controller_probe(struct platform_device *pdev)
301304
err = -ENOMEM;
302305
goto out_ida;
303306
}
304-
cd->class_dev->class = controller_class;
307+
cd->class_dev->class = &controller_class;
305308
cd->class_dev->groups = controller_attribute_groups;
306309
cd->class_dev->parent = dev;
307310
cd->class_dev->id = id;
@@ -351,20 +354,20 @@ static int __init controller_init(void)
351354
{
352355
int err;
353356

354-
controller_class = class_create("arcx_anybus_controller");
355-
if (IS_ERR(controller_class))
356-
return PTR_ERR(controller_class);
357+
err = class_register(&controller_class);
358+
if (err)
359+
return err;
357360
err = platform_driver_register(&controller_driver);
358361
if (err)
359-
class_destroy(controller_class);
362+
class_unregister(&controller_class);
360363

361364
return err;
362365
}
363366

364367
static void __exit controller_exit(void)
365368
{
366369
platform_driver_unregister(&controller_driver);
367-
class_destroy(controller_class);
370+
class_unregister(&controller_class);
368371
ida_destroy(&controller_index_ida);
369372
}
370373

‎drivers/staging/gdm724x/gdm_tty.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ static ssize_t gdm_tty_write(struct tty_struct *tty, const u8 *buf, size_t len)
160160

161161
while (remain) {
162162
size_t sending_len = min_t(size_t, MUX_TX_MAX_SIZE, remain);
163+
163164
gdm->tty_dev->send_func(gdm->tty_dev->priv_dev,
164165
(void *)(buf + sent_len),
165166
sending_len,

0 commit comments

Comments
 (0)