Commit e9259926 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull staging driver updates from Greg KH:
 "Here are a set of staging driver cleanups for 6.6-rc1. Nothing huge in
  here at all, overall we dropped a few hundred lines of code, it's been
  a quiet development cycle for this subsystem.

  Nothing stands out, everything can be categorized as "minor coding
  style cleanups for staging drivers" and there was one race condition
  fixed.

  Full details in the shortlog.

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

* tag 'staging-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (71 commits)
  staging: rtl8192e: Annotate struct rtllib_txb with __counted_by
  staging: greybus: fix alignment of open parenthesis
  staging: sm750fb: fix sii164InitChip function name
  staging: vme_user: fix check lines should not end with a '('
  staging: vme_user: fix check blank lines not necessary
  staging: rtl8723bs: Use helpers to check broadcast and multicast Ether addresses
  staging: vt6655: replace camel case by snake case
  staging: rtl8192e: Remove unsupported mode IW_MODE_MESH
  staging: rtl8192e: Remove unsupported mode IW_MODE_REPEAT
  staging: rtl8192e: Remove unused function rtllib_start_master_bss()
  staging: rtl8192e: Remove unsupported mode IW_MODE_MASTER
  staging: vt6655: Change camel case variables to snake case
  staging: fieldbus: arcx-anybus: Remove redundant of_match_ptr()
  staging: vme_user: fix alignment of open parenthesis
  Staging: rtl8192e: Rename function RxBaInactTimeout
  Staging: rtl8192e: Rename function TxBaInactTimeout
  Staging: rtl8192e: Rename function BaSetupTimeOut
  Staging: rtl8192e: Rename function TsInitDelBA
  Staging: rtl8192e: Rename function TsInitAddBA
  staging: vme_user: fix check alignment should match open parenthesis
  ...
parents 51e7accb aee17df0

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

+4 −14
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
 */



#include <linux/kernel.h>

#include <linux/of.h>

#include <linux/platform_device.h>

#include <linux/wait.h>

#include <linux/mutex.h>

#include <linux/device.h>
@@ -32,10 +34,6 @@ 
#include <linux/jiffies.h>

#include <linux/miscdevice.h>



#include <linux/of_address.h>

#include <linux/of_device.h>

#include <linux/of_platform.h>



/* ----------------------------

 *       driver parameters

 * ----------------------------
@@ -839,16 +837,8 @@ static int axis_fifo_probe(struct platform_device *pdev) 
	 * ----------------------------

	 */



	/* get iospace for the device */

	r_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!r_mem) {

		dev_err(fifo->dt_device, "invalid address\n");

		rc = -ENODEV;

		goto err_initial;

	}



	/* request physical memory */

	fifo->base_addr = devm_ioremap_resource(fifo->dt_device, r_mem);

	/* get iospace for the device and request physical memory */

	fifo->base_addr = devm_platform_get_and_ioremap_resource(pdev, 0, &r_mem);

	if (IS_ERR(fifo->base_addr)) {

		rc = PTR_ERR(fifo->base_addr);

		goto err_initial;

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

+3 −3
Original line number Diff line number Diff line
@@ -156,8 +156,8 @@ create_anybus_host(struct platform_device *pdev, int idx) 
	if (IS_ERR(ops.regmap))

		return ERR_CAST(ops.regmap);

	ops.irq = platform_get_irq(pdev, idx);

	if (ops.irq <= 0)

		return ERR_PTR(-EINVAL);

	if (ops.irq < 0)

		return ERR_PTR(ops.irq);

	return devm_anybuss_host_common_probe(&pdev->dev, &ops);

}
@@ -343,7 +343,7 @@ static struct platform_driver controller_driver = { 
	.remove_new = controller_remove,

	.driver		= {

		.name   = "arcx-anybus-controller",

		.of_match_table	= of_match_ptr(controller_of_match),

		.of_match_table	= controller_of_match,

	},

};

drivers/staging/greybus/arche-platform.c

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/suspend.h>

#include <linux/time.h>

#include <linux/greybus.h>

#include <linux/of.h>

#include "arche_platform.h"



#if IS_ENABLED(CONFIG_USB_HSIC_USB3613)

drivers/staging/greybus/pwm.c

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ struct gb_pwm_chip { 
	u8			pwm_max;	/* max pwm number */



	struct pwm_chip		chip;

	struct pwm_chip		*pwm;

};



static inline struct gb_pwm_chip *pwm_chip_to_gb_pwm_chip(struct pwm_chip *chip)

drivers/staging/media/imx/imx-media-capture.c

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
#include <linux/delay.h>

#include <linux/fs.h>

#include <linux/module.h>

#include <linux/of_platform.h>

#include <linux/pinctrl/consumer.h>

#include <linux/platform_device.h>

#include <linux/sched.h>