Commit 97b2ff29 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull staging driver updates from Greg KH:
 "Here is the large set of staging driver updates for 6.4-rc1. Once
  again, we removed more code than was added, a nice trend.

  It was a calm cycle, mostly all just small coding style cleanups,
  included in here are:

   - removal of the greybus loopback testing tools, userspace code that
     didn't belong in a driver subdirectory and was causing problems for
     some build systems

   - platform remove callback cleanups

   - rtl8192e huge cleanups

   - other small staging driver cleanups.

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

* tag 'staging-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (185 commits)
  staging: rtl8192e: Fix W_DISABLE# does not work after stop/start
  staging: rtl8192e: Remove unchanged variables bfsync_processing and more
  staging: rtl8192e: Remove unchanged variable frame_sync_monitor
  staging: rtl8192e: Remove unchanged variable chan_forced
  staging: rtl8192e: Remove set to true while true of bfirst_after_down
  staging: rtl8192e: Remove second initialization of bActuallySet
  staging: rtl8192e: Remove unused macro RT_SET_PS_LEVEL
  staging: rtl8192e: Remove unused function rtl92e_disable_nic
  staging: rtl8192e: Remove unchanged variable RegRfPsLevel
  staging: rtl8172: Add blank lines after declarations
  staging: rtl8192e: Remove unused variable RF_Type
  staging: rtl8192e: Remove one of two checks for hardware RTL8192SE
  staging: rtl8192e: Remove unused function _rtl92e_dm_init_wa_broadcom_iot
  staging: rtl8192e: Remove macro IS_HARDWARE_TYPE_8192SE
  staging: greybus: drop loopback test files
  staging: rtl8192e: Add blank lines after declarations
  staging: rtl8192e: avoid CamelCase <dot11RSNAStatsCCMPDecryptErrors>
  staging: rtl8192e: avoid CamelCase <dot11RSNAStatsCCMPReplays>
  staging: rtl8192e: avoid CamelCase <dot11RSNAStatsCCMPFormatErrors>
  staging: rtl8192e: fix alignment to match open parenthesis
  ...
parents b39667ab 3fac2397

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

+19 −15
Original line number Diff line number Diff line
@@ -103,17 +103,17 @@ 
 *           globals

 * ----------------------------

 */

static int read_timeout = 1000; /* ms to wait before read() times out */

static int write_timeout = 1000; /* ms to wait before write() times out */

static long read_timeout = 1000; /* ms to wait before read() times out */

static long write_timeout = 1000; /* ms to wait before write() times out */



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

 * module command-line arguments

 * ----------------------------

 */



module_param(read_timeout, int, 0444);

module_param(read_timeout, long, 0444);

MODULE_PARM_DESC(read_timeout, "ms to wait before blocking read() timing out; set to -1 for no timeout");

module_param(write_timeout, int, 0444);

module_param(write_timeout, long, 0444);

MODULE_PARM_DESC(write_timeout, "ms to wait before blocking write() timing out; set to -1 for no timeout");



/* ----------------------------
@@ -384,9 +384,7 @@ static ssize_t axis_fifo_read(struct file *f, char __user *buf, 
		mutex_lock(&fifo->read_lock);

		ret = wait_event_interruptible_timeout(fifo->read_queue,

			ioread32(fifo->base_addr + XLLF_RDFO_OFFSET),

				 (read_timeout >= 0) ?

				  msecs_to_jiffies(read_timeout) :

				  MAX_SCHEDULE_TIMEOUT);

			read_timeout);



		if (ret <= 0) {

			if (ret == 0) {
@@ -528,9 +526,7 @@ static ssize_t axis_fifo_write(struct file *f, const char __user *buf, 
		ret = wait_event_interruptible_timeout(fifo->write_queue,

			ioread32(fifo->base_addr + XLLF_TDFV_OFFSET)

				 >= words_to_write,

				 (write_timeout >= 0) ?

				  msecs_to_jiffies(write_timeout) :

				  MAX_SCHEDULE_TIMEOUT);

			write_timeout);



		if (ret <= 0) {

			if (ret == 0) {
@@ -920,15 +916,13 @@ static int axis_fifo_probe(struct platform_device *pdev) 
	return rc;

}



static int axis_fifo_remove(struct platform_device *pdev)

static void axis_fifo_remove(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct axis_fifo *fifo = dev_get_drvdata(dev);



	misc_deregister(&fifo->miscdev);

	dev_set_drvdata(dev, NULL);



	return 0;

}



static const struct of_device_id axis_fifo_of_match[] = {
@@ -943,12 +937,22 @@ static struct platform_driver axis_fifo_driver = { 
		.of_match_table	= axis_fifo_of_match,

	},

	.probe		= axis_fifo_probe,

	.remove		= axis_fifo_remove,

	.remove_new	= axis_fifo_remove,

};



static int __init axis_fifo_init(void)

{

	pr_info("axis-fifo driver loaded with parameters read_timeout = %i, write_timeout = %i\n",

	if (read_timeout >= 0)

		read_timeout = msecs_to_jiffies(read_timeout);

	else

		read_timeout = MAX_SCHEDULE_TIMEOUT;



	if (write_timeout >= 0)

		write_timeout = msecs_to_jiffies(write_timeout);

	else

		write_timeout = MAX_SCHEDULE_TIMEOUT;



	pr_info("axis-fifo driver loaded with parameters read_timeout = %li, write_timeout = %li\n",

		read_timeout, write_timeout);

	return platform_driver_register(&axis_fifo_driver);

}

drivers/staging/emxx_udc/emxx_udc.c

+2 −4
Original line number Diff line number Diff line
@@ -3137,7 +3137,7 @@ static void nbu2ss_drv_shutdown(struct platform_device *pdev) 
}



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

static int nbu2ss_drv_remove(struct platform_device *pdev)

static void nbu2ss_drv_remove(struct platform_device *pdev)

{

	struct nbu2ss_udc	*udc;

	struct nbu2ss_ep	*ep;
@@ -3154,8 +3154,6 @@ static int nbu2ss_drv_remove(struct platform_device *pdev) 


	/* Interrupt Handler - Release */

	free_irq(vbus_irq, udc);



	return 0;

}



/*-------------------------------------------------------------------------*/
@@ -3210,7 +3208,7 @@ static int nbu2ss_drv_resume(struct platform_device *pdev) 
static struct platform_driver udc_driver = {

	.probe		= nbu2ss_drv_probe,

	.shutdown	= nbu2ss_drv_shutdown,

	.remove		= nbu2ss_drv_remove,

	.remove_new	= nbu2ss_drv_remove,

	.suspend	= nbu2ss_drv_suspend,

	.resume		= nbu2ss_drv_resume,

	.driver		= {

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

+2 −3
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ static int controller_probe(struct platform_device *pdev) 
	return err;

}



static int controller_remove(struct platform_device *pdev)

static void controller_remove(struct platform_device *pdev)

{

	struct controller_priv *cd = platform_get_drvdata(pdev);

	int id = cd->class_dev->id;
@@ -329,7 +329,6 @@ static int controller_remove(struct platform_device *pdev) 
	device_unregister(cd->class_dev);

	ida_simple_remove(&controller_index_ida, id);

	gpiod_set_value_cansleep(cd->reset_gpiod, 1);

	return 0;

}



static const struct of_device_id controller_of_match[] = {
@@ -341,7 +340,7 @@ MODULE_DEVICE_TABLE(of, controller_of_match); 


static struct platform_driver controller_driver = {

	.probe = controller_probe,

	.remove = controller_remove,

	.remove_new = controller_remove,

	.driver		= {

		.name   = "arcx-anybus-controller",

		.of_match_table	= of_match_ptr(controller_of_match),

drivers/staging/greybus/arche-apb-ctrl.c

+2 −4
Original line number Diff line number Diff line
@@ -419,13 +419,11 @@ static int arche_apb_ctrl_probe(struct platform_device *pdev) 
	return 0;

}



static int arche_apb_ctrl_remove(struct platform_device *pdev)

static void arche_apb_ctrl_remove(struct platform_device *pdev)

{

	device_remove_file(&pdev->dev, &dev_attr_state);

	poweroff_seq(pdev);

	platform_set_drvdata(pdev, NULL);



	return 0;

}



static int __maybe_unused arche_apb_ctrl_suspend(struct device *dev)
@@ -471,7 +469,7 @@ static const struct of_device_id arche_apb_ctrl_of_match[] = { 


static struct platform_driver arche_apb_ctrl_device_driver = {

	.probe		= arche_apb_ctrl_probe,

	.remove		= arche_apb_ctrl_remove,

	.remove_new	= arche_apb_ctrl_remove,

	.shutdown	= arche_apb_ctrl_shutdown,

	.driver		= {

		.name	= "arche-apb-ctrl",

drivers/staging/greybus/arche-platform.c

+2 −4
Original line number Diff line number Diff line
@@ -559,7 +559,7 @@ static int arche_remove_child(struct device *dev, void *unused) 
	return 0;

}



static int arche_platform_remove(struct platform_device *pdev)

static void arche_platform_remove(struct platform_device *pdev)

{

	struct arche_platform_drvdata *arche_pdata = platform_get_drvdata(pdev);
@@ -570,8 +570,6 @@ static int arche_platform_remove(struct platform_device *pdev) 


	if (usb3613_hub_mode_ctrl(false))

		dev_warn(arche_pdata->dev, "failed to control hub device\n");

		/* TODO: Should we do anything more here ?? */

	return 0;

}



static __maybe_unused int arche_platform_suspend(struct device *dev)
@@ -631,7 +629,7 @@ MODULE_DEVICE_TABLE(of, arche_combined_id); 


static struct platform_driver arche_platform_device_driver = {

	.probe		= arche_platform_probe,

	.remove		= arche_platform_remove,

	.remove_new	= arche_platform_remove,

	.shutdown	= arche_platform_shutdown,

	.driver		= {

		.name	= "arche-platform-ctrl",