Commit 0601f25d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull staging driver updates from Greg KH:
 "Here is the "boring" staging driver update for 6.3-rc1.

  Nothing major in here at all, it's just lots of tiny code cleanups to
  bring some of the staging drivers more in line with the real portion
  of the kernel (apis and coding style.) Overall we remove more lines of
  code than we add, always a nice result.

  The big work was done by Martin Kaiser and Philipp Hortmann, both
  tackling some of the older wifi drivers, removing unused code and
  structures and a file in one case.

  Full details of the changes are in the shortlog.

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

* tag 'staging-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (219 commits)
  staging: r8188eu: Revert "staging: r8188eu: simplify rtw_get_ff_hwaddr"
  staging: r8188eu: replace hand coded loop with list_for_each_entry
  staging: r8188eu: merge _rtw_enqueue_cmd into its caller
  most: add maintainer entry
  staging: rtl8192e: Use BIT() instead of << for bit field MSR_LINK_MASK
  staging: rtl8192e: Rename DM_RxPathSelTable
  staging: rtl8192e: Rename diff_TH and disabledRF
  staging: rtl8192e: Rename Enable, cck_Rx_path and SS_TH_low
  staging: rtl8192e: Rename RateAdaptiveTH.., VeryLowRSSI and WAIotTHVal
  staging: rtl8192e: Rename RxPathSelectio.., RateAdaptive.. and RateAdap..
  staging: rtl8192e: Rename OFDM_Table.., CCK_Table_.. and RxPathSelecti..
  staging: rtl8192e: Rename MacBlkCtrl and remove double definition
  staging: rtl8192e: Remove blank lines in r8192E_hw.h, rtl_core.h and ..
  staging: rtl8192e: Rename AcmHw_ViqEn, AcmHw_VoqEn and ANAPAR_FOR_8192PciE
  staging: r8188eu: bagg_pkt parameter is not used
  staging: r8188eu: simplify rtw_get_ff_hwaddr
  staging: r8188eu: simplify xmit_buf flags
  staging: r8188eu: xmit_buf's ff_hwaddr is not used
  staging: r8188eu: remove unused frametag defines
  staging: r8188eu: simplify rtw_alloc_xmitframe
  ...
parents 17cd4d6f b5929325

MAINTAINERS

+10 −0
Original line number Diff line number Diff line
@@ -14069,6 +14069,16 @@ F: drivers/regulator/mpq7920.c 
F:	drivers/regulator/mpq7920.h

F:	include/linux/mfd/mp2629.h









MOST(R) TECHNOLOGY DRIVER









M:	Parthiban Veerasooran <parthiban.veerasooran@microchip.com>









M:	Christian Gromm <christian.gromm@microchip.com>









S:	Maintained









F:	Documentation/ABI/testing/configfs-most









F:	Documentation/ABI/testing/sysfs-bus-most









F:	drivers/most/









F:	drivers/staging/most/









F:	include/linux/most.h

















MOTION EYE VAIO PICTUREBOOK CAMERA DRIVER









S:	Orphan









W:	http://popies.net/meye/
































drivers/staging/emxx_udc/emxx_udc.c



+6
−1






























Original line number
Diff line number
Diff line







@@ -2587,10 +2587,15 @@ static int nbu2ss_ep_queue(struct usb_ep *_ep,







		req->unaligned = false;



















	if (req->unaligned) {









		if (!ep->virt_buf)









		if (!ep->virt_buf) {









			ep->virt_buf = dma_alloc_coherent(udc->dev, PAGE_SIZE,









							  &ep->phys_buf,









							  GFP_ATOMIC | GFP_DMA);









			if (!ep->virt_buf) {









				spin_unlock_irqrestore(&udc->lock, flags);









				return -ENOMEM;









			}









		}









		if (ep->epnum > 0)  {









			if (ep->direct == USB_DIR_IN)









				memcpy(ep->virt_buf, req->req.buf,
































drivers/staging/greybus/gpio.c



+5
−1






























Original line number
Diff line number
Diff line







@@ -43,7 +43,11 @@ struct gb_gpio_controller {







};









#define gpio_chip_to_gb_gpio_controller(chip) \









	container_of(chip, struct gb_gpio_controller, chip)









#define irq_data_to_gpio_chip(d) (d->domain->host_data)



















static struct gpio_chip *irq_data_to_gpio_chip(struct irq_data *d)









{









	return d->domain->host_data;









}



















static int gb_gpio_line_count_operation(struct gb_gpio_controller *ggc)









{
































drivers/staging/greybus/usb.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -27,7 +27,7 @@ struct gb_usb_hub_control_request {







};



















struct gb_usb_hub_control_response {









	u8 buf[0];









	DECLARE_FLEX_ARRAY(u8, buf);









};



















struct gb_usb_device {
































drivers/staging/ks7010/ks_wlan_net.c



+1
−2






























Original line number
Diff line number
Diff line







@@ -382,8 +382,7 @@ static int ks_wlan_get_nick(struct net_device *dev,







		return -EPERM;



















	/* for SLEEP MODE */









	strncpy(extra, priv->nick, 16);









	extra[16] = '\0';









	strscpy(extra, priv->nick, 17);









	dwrq->data.length = strlen(extra) + 1;



















	return 0;