Commit 0a59b3f4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'staging-6.9-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 cleanups for 6.9-rc1. Nothing
  major in here, lots of small coding style cleanups for most drivers,
  and the removal of some obsolete hardare (the emxx_udc and some
  drivers/staging/board/ files).

  All of these have been in linux-next for a long time with no reported
  issues"

* tag 'staging-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (122 commits)
  staging: greybus: Replaces directive __attribute__((packed)) by __packed as suggested by checkpatch
  staging: greybus: Replace __attribute__((packed)) by __packed in various instances
  Staging: rtl8192e: Rename function GetHalfNmodeSupportByAPsHandler()
  Staging: rtl8192e: Rename function rtllib_FlushRxTsPendingPkts()
  Staging: rtl8192e: Rename goto OnADDBARsp_Reject
  Staging: rtl8192e: Rename goto OnADDBAReq_Fail
  Staging: rtl8192e: Rename function rtllib_send_ADDBARsp()
  Staging: rtl8192e: Rename function rtllib_send_ADDBAReq()
  Staging: rtl8192e: Rename variable TxRxSelect
  Staging: rtl8192e: Fix 5 chckpatch alignment warnings in rtl819x_BAProc.c
  Staging: rtl8192e: Rename function MgntQuery_MgntFrameTxRate
  Staging: rtl8192e: Rename boolean variable bHalfWirelessN24GMode
  Staging: rtl8192e: Rename reference AllowAllDestAddrHandler
  Staging: rtl8192e: Rename varoable asSta
  Staging: rtl8192e: Rename varoable osCcxVerNum
  Staging: rtl8192e: Rename variable CcxAironetBuf
  Staging: rtl8192e: Rename variable osCcxAironetIE
  Staging: rtl8192e: Rename variable AironetIeOui
  Staging: rtl8192e: Rename variable asRsn
  Staging: rtl8192e: Rename variable CcxVerNumBuf
  ...
parents 3bcb0bf6 68bb540b

drivers/staging/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -46,14 +46,10 @@ source "drivers/staging/iio/Kconfig" 


source "drivers/staging/sm750fb/Kconfig"



source "drivers/staging/emxx_udc/Kconfig"



source "drivers/staging/nvec/Kconfig"



source "drivers/staging/media/Kconfig"



source "drivers/staging/board/Kconfig"



source "drivers/staging/gdm724x/Kconfig"



source "drivers/staging/fbtft/Kconfig"

drivers/staging/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -14,9 +14,7 @@ obj-$(CONFIG_VT6656) += vt6656/ 
obj-$(CONFIG_VME_BUS)		+= vme_user/

obj-$(CONFIG_IIO)		+= iio/

obj-$(CONFIG_FB_SM750)		+= sm750fb/

obj-$(CONFIG_USB_EMXX)		+= emxx_udc/

obj-$(CONFIG_MFD_NVEC)		+= nvec/

obj-$(CONFIG_STAGING_BOARD)	+= board/

obj-$(CONFIG_LTE_GDM724X)	+= gdm724x/

obj-$(CONFIG_FB_TFT)		+= fbtft/

obj-$(CONFIG_MOST)		+= most/

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

+1 −6
Original line number Diff line number Diff line
@@ -165,14 +165,9 @@ static ssize_t sysfs_read(struct device *dev, char *buf, 
{

	struct axis_fifo *fifo = dev_get_drvdata(dev);

	unsigned int read_val;

	unsigned int len;

	char tmp[32];



	read_val = ioread32(fifo->base_addr + addr_offset);

	len =  snprintf(tmp, sizeof(tmp), "0x%x\n", read_val);

	memcpy(buf, tmp, len);



	return len;

	return sysfs_emit(buf, "0x%x\n", read_val);

}



static ssize_t isr_store(struct device *dev, struct device_attribute *attr,

drivers/staging/board/Kconfig

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

config STAGING_BOARD

	bool "Staging Board Support"

	depends on OF_ADDRESS && OF_IRQ && HAVE_CLK

	help

	  Staging board base is to support continuous upstream

	  in-tree development and integration of platform devices.



	  Helps developers integrate devices as platform devices for

	  device drivers that only provide platform device bindings.

	  This in turn allows for incremental development of both

	  hardware feature support and DT binding work in parallel.

drivers/staging/board/Makefile

deleted100644 → 0
+0 −4
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

obj-y	:= board.o

obj-$(CONFIG_ARCH_EMEV2)	+= kzm9d.o

obj-$(CONFIG_ARCH_R8A7740)	+= armadillo800eva.o