Commit db9c6d1d authored Jul 03, 2023 by Linus Torvalds

Merge tag 'staging-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Pull staging driver updates from Greg KH:
 "Here is a set of staging driver updates for 6.5-rc1. It's a small
  update this merge window, nothing major at all, overall just under
  1000 lines of code removed, not a huge churn.

  Nothing major to highlight here either, just lots of small coding
  style fixes.

  All of these have been in linux-next for a while with no reported
  problems"

* tag 'staging-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (62 commits)
  staging: rtl8192e: Remove whitespace and blank lines
  staging: rtl8192e: remove 5G related code
  staging: rtl8192e: remove comparison to true
  staging: rtl8192e: remove return statement from void function
  staging: rtl8192e: convert else if sequence to switch
  staging: rtl8192e: clean up brace coding style issues
  staging: rtl8723bs: Fix blank line issues
  staging: rtl8723bs: Fix block comment issue
  staging: rtl8723bs: Fix indentation issues
  staging: vchiq_arm: Remove extra struct vchiq_instance declaration
  staging: rtl8192e: Rename variable InitialGainHandler
  staging: rtl8192e: Rename variable LeisurePSLeave
  staging: rtl8192e: Rename variable SetBWModeHandler
  staging: rtl8192e: Rename variable SetWirelessMode
  staging: rtl8192e: Rename RTLLIB_LINKED_SCANNING
  staging: rtl8192e: Rename RTLLIB_LINKED to MAC80211_LINKED
  staging: rtl8192e: Rename RTLLIB_NOLINK to MAC80211_NOLINK
  staging: rtl8192e: Rename state to link_state
  staging: rtl8192e: Rename rtllib_state to rtl_link_state
  staging: rtl8192e: Remove unused enum led_ctl_mode
  ...

parents fc75f216 4a22870c

drivers/staging/axis-fifo/axis-fifo.c

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -906,9 +906,6 @@ static int axis_fifo_probe(struct platform_device *pdev)
	if (rc < 0)		if (rc < 0)
	goto err_initial;		goto err_initial;

	dev_info(fifo->dt_device, "axis-fifo created at %pa mapped to 0x%pa, irq=%i\n",
	&r_mem->start, &fifo->base_addr, fifo->irq);

	return 0;		return 0;

	err_initial:		err_initial:

drivers/staging/most/i2c/i2c.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -362,7 +362,7 @@ static struct i2c_driver i2c_driver = {
	.driver = {		.driver = {
	.name = "hdm_i2c",		.name = "hdm_i2c",
	},		},
	.probe_new = i2c_probe,		.probe = i2c_probe,
	.remove = i2c_remove,		.remove = i2c_remove,
	.id_table = i2c_id,		.id_table = i2c_id,
	};		};

drivers/staging/olpc_dcon/olpc_dcon.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -779,7 +779,7 @@ static struct i2c_driver dcon_driver = {
	},		},
	.class = I2C_CLASS_DDC \| I2C_CLASS_HWMON,		.class = I2C_CLASS_DDC \| I2C_CLASS_HWMON,
	.id_table = dcon_idtable,		.id_table = dcon_idtable,
	.probe_new = dcon_probe,		.probe = dcon_probe,
	.remove = dcon_remove,		.remove = dcon_remove,
	.detect = dcon_detect,		.detect = dcon_detect,
	.address_list = normal_i2c,		.address_list = normal_i2c,

drivers/staging/pi433/pi433_if.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1019,7 +1019,6 @@ static int setup_gpio(struct pi433_device *device)
	}		}

	/* configure the pin */		/* configure the pin */
	gpiod_unexport(device->gpiod[i]);
	retval = gpiod_direction_input(device->gpiod[i]);		retval = gpiod_direction_input(device->gpiod[i]);
	if (retval)		if (retval)
	return retval;		return retval;

drivers/staging/rtl8192e/rtl8192e/Kconfig

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3,6 +3,7 @@ config RTL8192E
	tristate "RealTek RTL8192E Wireless LAN NIC driver"		tristate "RealTek RTL8192E Wireless LAN NIC driver"
	depends on PCI && WLAN && RTLLIB		depends on PCI && WLAN && RTLLIB
	depends on m		depends on m
			select CFG80211
	select WIRELESS_EXT		select WIRELESS_EXT
	select WEXT_PRIV		select WEXT_PRIV
	select CRYPTO		select CRYPTO