projects/linux·commit 59697e06

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

59697e06 · Linus Torvalds <[email protected]> · 2025-10-04 16:17:14 -07:00

Pull staging driver updates from Greg KH:
 "Here is the 'big' set of staging driver changes for 6.18-rc1. Nothing
  really exciting in here they pretty much consist of:

   - minor coding style changes and cleanups

   - some api layer removals where not needed

  Overall a quiet development cycle.

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

* tag 'staging-6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (63 commits)
  staging: rtl8723bs: xmit: rephrase comment and drop extra space
  staging: sm750fb: rename camel case variable
  staging: rtl8723bs: hal: put return type and function name on one line
  staging: rtl8723bs: fix typo in comment
  staging: sm750fb: rename snake case variables
  staging: sm750fb: remove unnecessary volatile qualifiers
  staging: rtl8723bs: rtw_efuse.h: simplify copyright banner
  staging: rtl8723bs: remove unused tables
  staging: rtl8723bs: Hal_EfuseParseAntennaDiversity_8723B is empty
  staging: rtl8723bs: remove REG_EFUSE_ACCESS_8723 and EFUSE_ACCESS_ON_8723
  staging: rtl8723bs: remove bWrite from Hal_EfusePowerSwitch
  staging: rtl8723bs: remove wrapper Efuse_PowerSwitch
  staging: octeon: Clean up dead code in ethernet-tx.c
  staging: rtl8723bs: fix fortify warnings by using struct_group
  staging: gpib: use int type to store negative error codes
  staging: rtl8723bs: remove include/recv_osdep.h
  staging: rtl8723bs: remove os_dep/recv_linux.c
  staging: rtl8723bs: rename rtw_os_recv_indicate_pkt
  staging: rtl8723bs: move rtw_os_recv_indicate_pkt to rtw_recv.c
  staging: rtl8723bs: rename rtw_os_alloc_msdu_pkt
  ...
Commit
59697e061f6aec86d5738cd4752e16520f1d60dc
Parents
c6006b8c · b76029bd

Merge commit. Changes below are compared with the first parent: c6006b8c.

Changes

67 files changed · +857 −1685

FileStatusAddDelContent
drivers/staging/axis-fifo/axis-fifo.cmodified+19−18View file
drivers/staging/gpib/agilent_82357a/agilent_82357a.cmodified+9−9View file
drivers/staging/gpib/agilent_82357a/agilent_82357a.hmodified+5−5View file
drivers/staging/gpib/cb7210/cb7210.hmodified+2−2View file
drivers/staging/gpib/cec/cec_gpib.cmodified+1−1View file
drivers/staging/gpib/common/gpib_os.cmodified+1−1View file
drivers/staging/gpib/common/iblib.cmodified+1−1View file
drivers/staging/gpib/eastwood/fluke_gpib.cmodified+1−1View file
drivers/staging/gpib/fmh_gpib/fmh_gpib.cmodified+1−1View file
drivers/staging/gpib/gpio/gpib_bitbang.cmodified+8−8View file
drivers/staging/gpib/hp_82341/hp_82341.cmodified+6−6View file
drivers/staging/gpib/hp_82341/hp_82341.hmodified+20−20View file
drivers/staging/gpib/include/amccs5933.hmodified+2−2View file
drivers/staging/gpib/include/gpib_types.hmodified+2−1View file
drivers/staging/gpib/include/nec7210.hmodified+13−13View file
drivers/staging/gpib/include/nec7210_registers.hmodified+2−2View file
drivers/staging/gpib/include/plx9050.hmodified+4−4View file
drivers/staging/gpib/include/tms9914.hmodified+45−45View file
drivers/staging/gpib/include/tnt4882_registers.hmodified+11−11View file
drivers/staging/gpib/ines/ines.hmodified+6−6View file
drivers/staging/gpib/ines/ines_gpib.cmodified+2−2View file
drivers/staging/gpib/nec7210/nec7210.cmodified+3−3View file
drivers/staging/gpib/ni_usb/ni_usb_gpib.cmodified+5−5View file
drivers/staging/gpib/ni_usb/ni_usb_gpib.hmodified+5−5View file
drivers/staging/gpib/pc2/pc2_gpib.cmodified+2−2View file
drivers/staging/gpib/tms9914/tms9914.cmodified+5−5View file
drivers/staging/gpib/tnt4882/mite.hmodified+5−5View file
drivers/staging/gpib/tnt4882/tnt4882_gpib.cmodified+2−3View file
drivers/staging/octeon/ethernet-tx.cmodified+0−40View file
drivers/staging/octeon/octeon-stubs.hmodified+68−66View file
drivers/staging/rtl8723bs/Makefilemodified+0−2View file
drivers/staging/rtl8723bs/core/rtw_ap.cmodified+3−5View file
drivers/staging/rtl8723bs/core/rtw_efuse.cmodified+10−159View file
drivers/staging/rtl8723bs/core/rtw_mlme.cmodified+172−59View file
drivers/staging/rtl8723bs/core/rtw_mlme_ext.cmodified+66−64View file
drivers/staging/rtl8723bs/core/rtw_pwrctrl.cmodified+2−8View file
drivers/staging/rtl8723bs/core/rtw_recv.cmodified+188−6View file
drivers/staging/rtl8723bs/core/rtw_security.cmodified+18−60View file
drivers/staging/rtl8723bs/core/rtw_sta_mgt.cmodified+4−2View file
drivers/staging/rtl8723bs/core/rtw_wlan_util.cmodified+30−30View file
drivers/staging/rtl8723bs/core/rtw_xmit.cmodified+1−1View file
drivers/staging/rtl8723bs/hal/hal_com_phycfg.cmodified+1−4View file
drivers/staging/rtl8723bs/hal/hal_pwr_seq.cmodified+1−1View file
drivers/staging/rtl8723bs/hal/odm.cmodified+0−152View file
drivers/staging/rtl8723bs/hal/odm.hmodified+0−6View file
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.cmodified+54−314View file
drivers/staging/rtl8723bs/hal/rtl8723bs_recv.cmodified+4−2View file
drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.cmodified+1−1View file
drivers/staging/rtl8723bs/hal/sdio_halinit.cmodified+0−1View file
drivers/staging/rtl8723bs/include/basic_types.hmodified+22−19View file
drivers/staging/rtl8723bs/include/drv_types.hmodified+0−2View file
drivers/staging/rtl8723bs/include/hal_intf.hmodified+3−4View file
drivers/staging/rtl8723bs/include/mlme_osdep.hdeleted+0−19View before deletion
drivers/staging/rtl8723bs/include/recv_osdep.hdeleted+0−40View before deletion
drivers/staging/rtl8723bs/include/rtl8723b_hal.hmodified+0−2View file
drivers/staging/rtl8723bs/include/rtw_efuse.hmodified+4−11View file
drivers/staging/rtl8723bs/include/rtw_mlme.hmodified+1−0View file
drivers/staging/rtl8723bs/include/rtw_mlme_ext.hmodified+0−2View file
drivers/staging/rtl8723bs/include/rtw_recv.hmodified+4−0View file
drivers/staging/rtl8723bs/os_dep/mlme_linux.cdeleted+0−179View before deletion
drivers/staging/rtl8723bs/os_dep/recv_linux.cdeleted+0−225View before deletion
drivers/staging/sm750fb/sm750.hmodified+3−3View file
drivers/staging/sm750fb/sm750_accel.cmodified+4−4View file
drivers/staging/sm750fb/sm750_hw.cmodified+2−2View file
drivers/staging/vc04_services/vchiq-mmal/mmal-msg.hmodified+1−1View file
drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.cmodified+1−1View file
drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.hmodified+1−1View file

Only the first 600 diff lines are shown. Download the complete patch.

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

View file
diff --git a/drivers/staging/axis-fifo/axis-fifo.c b/drivers/staging/axis-fifo/axis-fifo.c
index 57ed580..e8aa632 100644
--- a/drivers/staging/axis-fifo/axis-fifo.c
+++ b/drivers/staging/axis-fifo/axis-fifo.c
@@ -107,6 +107,8 @@
static long read_timeout = 1000; /* ms to wait before read() times out */
static long write_timeout = 1000; /* ms to wait before write() times out */
+static DEFINE_IDA(axis_fifo_ida);
+
/* ----------------------------
* module command-line arguments
* ----------------------------
@@ -123,6 +125,7 @@ MODULE_PARM_DESC(write_timeout, "ms to wait before blocking write() timing out;
*/
struct axis_fifo {
+ int id;
int irq; /* interrupt */
void __iomem *base_addr; /* kernel space memory */
@@ -693,17 +696,11 @@ static int axis_fifo_probe(struct platform_device *pdev)
/* 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;
- }
+ if (IS_ERR(fifo->base_addr))
+ return PTR_ERR(fifo->base_addr);
dev_dbg(fifo->dt_device, "remapped memory to 0x%p\n", fifo->base_addr);
- /* create unique device name */
- snprintf(device_name, 32, "%s_%pa", DRIVER_NAME, &r_mem->start);
- dev_dbg(fifo->dt_device, "device name [%s]\n", device_name);
-
/* ----------------------------
* init IP
* ----------------------------
@@ -711,7 +708,7 @@ static int axis_fifo_probe(struct platform_device *pdev)
rc = axis_fifo_parse_dt(fifo);
if (rc)
- goto err_initial;
+ return rc;
reset_ip_core(fifo);
@@ -723,7 +720,7 @@ static int axis_fifo_probe(struct platform_device *pdev)
/* get IRQ resource */
rc = platform_get_irq(pdev, 0);
if (rc < 0)
- goto err_initial;
+ return rc;
/* request IRQ */
fifo->irq = rc;
@@ -732,13 +729,18 @@ static int axis_fifo_probe(struct platform_device *pdev)
if (rc) {
dev_err(fifo->dt_device, "couldn't allocate interrupt %i\n",
fifo->irq);
- goto err_initial;
+ return rc;
}
/* ----------------------------
* init char device
* ----------------------------
*/
+ fifo->id = ida_alloc(&axis_fifo_ida, GFP_KERNEL);
+ if (fifo->id < 0)
+ return fifo->id;
+
+ snprintf(device_name, 32, "%s%d", DRIVER_NAME, fifo->id);
/* create character device */
fifo->miscdev.fops = &fops;
@@ -746,16 +748,14 @@ static int axis_fifo_probe(struct platform_device *pdev)
fifo->miscdev.name = device_name;
fifo->miscdev.parent = dev;
rc = misc_register(&fifo->miscdev);
- if (rc < 0)
- goto err_initial;
+ if (rc < 0) {
+ ida_free(&axis_fifo_ida, fifo->id);
+ return rc;
+ }
axis_fifo_debugfs_init(fifo);
return 0;
-
-err_initial:
- dev_set_drvdata(dev, NULL);
- return rc;
}
static void axis_fifo_remove(struct platform_device *pdev)
@@ -765,7 +765,7 @@ static void axis_fifo_remove(struct platform_device *pdev)
debugfs_remove(fifo->debugfs_dir);
misc_deregister(&fifo->miscdev);
- dev_set_drvdata(dev, NULL);
+ ida_free(&axis_fifo_ida, fifo->id);
}
static const struct of_device_id axis_fifo_of_match[] = {
@@ -805,6 +805,7 @@ module_init(axis_fifo_init);
static void __exit axis_fifo_exit(void)
{
platform_driver_unregister(&axis_fifo_driver);
+ ida_destroy(&axis_fifo_ida);
}
module_exit(axis_fifo_exit);

drivers/staging/gpib/agilent_82357a/agilent_82357a.c

View file
diff --git a/drivers/staging/gpib/agilent_82357a/agilent_82357a.c b/drivers/staging/gpib/agilent_82357a/agilent_82357a.c
index b923dc6..77c8e54 100644
--- a/drivers/staging/gpib/agilent_82357a/agilent_82357a.c
+++ b/drivers/staging/gpib/agilent_82357a/agilent_82357a.c
@@ -449,8 +449,8 @@ static int agilent_82357a_read(struct gpib_board *board, u8 *buffer, size_t leng
if (!out_data)
return -ENOMEM;
out_data[i++] = DATA_PIPE_CMD_READ;
- out_data[i++] = 0; //primary address when ARF_NO_ADDR is not set
- out_data[i++] = 0; //secondary address when ARF_NO_ADDR is not set
+ out_data[i++] = 0; // primary address when ARF_NO_ADDR is not set
+ out_data[i++] = 0; // secondary address when ARF_NO_ADDR is not set
out_data[i] = ARF_NO_ADDRESS | ARF_END_ON_EOI;
if (a_priv->eos_mode & REOS)
out_data[i] |= ARF_END_ON_EOS_CHAR;
@@ -532,7 +532,7 @@ static int agilent_82357a_read(struct gpib_board *board, u8 *buffer, size_t leng
*/
agilent_82357a_take_control_internal(board, 0);
- //FIXME check trailing flags for error
+ // FIXME check trailing flags for error
return retval;
}
@@ -966,7 +966,7 @@ static int agilent_82357a_parallel_poll(struct gpib_board *board, u8 *result)
dev_err(&usb_dev->dev, "write_registers() returned error\n");
return retval;
}
- udelay(2); //silly, since usb write will take way longer
+ udelay(2); // silly, since usb write will take way longer
read.address = CPTR;
retval = agilent_82357a_read_registers(a_priv, &read, 1, 1);
if (retval) {
@@ -989,31 +989,31 @@ static int agilent_82357a_parallel_poll(struct gpib_board *board, u8 *result)
static void agilent_82357a_parallel_poll_configure(struct gpib_board *board, u8 config)
{
- //board can only be system controller
+ // board can only be system controller
return;// 0;
}
static void agilent_82357a_parallel_poll_response(struct gpib_board *board, int ist)
{
- //board can only be system controller
+ // board can only be system controller
return;// 0;
}
static void agilent_82357a_serial_poll_response(struct gpib_board *board, u8 status)
{
- //board can only be system controller
+ // board can only be system controller
return;// 0;
}
static u8 agilent_82357a_serial_poll_status(struct gpib_board *board)
{
- //board can only be system controller
+ // board can only be system controller
return 0;
}
static void agilent_82357a_return_to_local(struct gpib_board *board)
{
- //board can only be system controller
+ // board can only be system controller
return;// 0;
}

drivers/staging/gpib/agilent_82357a/agilent_82357a.h

View file
diff --git a/drivers/staging/gpib/agilent_82357a/agilent_82357a.h b/drivers/staging/gpib/agilent_82357a/agilent_82357a.h
index 23aa479..33ac558 100644
--- a/drivers/staging/gpib/agilent_82357a/agilent_82357a.h
+++ b/drivers/staging/gpib/agilent_82357a/agilent_82357a.h
@@ -20,7 +20,7 @@ enum usb_vendor_ids {
enum usb_device_ids {
USB_DEVICE_ID_AGILENT_82357A = 0x0107,
USB_DEVICE_ID_AGILENT_82357A_PREINIT = 0x0007, // device id before firmware is loaded
- USB_DEVICE_ID_AGILENT_82357B = 0x0718, // device id before firmware is loaded
+ USB_DEVICE_ID_AGILENT_82357B = 0x0718, // device id before firmware is loaded
USB_DEVICE_ID_AGILENT_82357B_PREINIT = 0x0518, // device id before firmware is loaded
};
@@ -129,10 +129,10 @@ struct agilent_82357a_priv {
struct urb *bulk_urb;
struct urb *interrupt_urb;
u8 *interrupt_buffer;
- struct mutex bulk_transfer_lock; // bulk transfer lock
- struct mutex bulk_alloc_lock; // bulk transfer allocation lock
- struct mutex interrupt_alloc_lock; // interrupt allocation lock
- struct mutex control_alloc_lock; // control message allocation lock
+ struct mutex bulk_transfer_lock; // bulk transfer lock
+ struct mutex bulk_alloc_lock; // bulk transfer allocation lock
+ struct mutex interrupt_alloc_lock; // interrupt allocation lock
+ struct mutex control_alloc_lock; // control message allocation lock
struct timer_list bulk_timer;
struct agilent_82357a_urb_ctx context;
unsigned int bulk_out_endpoint;

drivers/staging/gpib/cb7210/cb7210.h

View file
diff --git a/drivers/staging/gpib/cb7210/cb7210.h b/drivers/staging/gpib/cb7210/cb7210.h
index 13f1275..ddc841f 100644
--- a/drivers/staging/gpib/cb7210/cb7210.h
+++ b/drivers/staging/gpib/cb7210/cb7210.h
@@ -56,10 +56,10 @@ enum cb7210_page_in {
};
enum hs_regs {
- //write registers
+ // write registers
HS_MODE = 0x8, /* HS_MODE register */
HS_INT_LEVEL = 0x9, /* HS_INT_LEVEL register */
- //read registers
+ // read registers
HS_STATUS = 0x8, /* HS_STATUS register */
};

drivers/staging/gpib/cec/cec_gpib.c

View file
diff --git a/drivers/staging/gpib/cec/cec_gpib.c b/drivers/staging/gpib/cec/cec_gpib.c
index 0c9d10e..dbf9b95 100644
--- a/drivers/staging/gpib/cec/cec_gpib.c
+++ b/drivers/staging/gpib/cec/cec_gpib.c
@@ -206,7 +206,7 @@ static struct gpib_interface cec_pci_interface = {
.parallel_poll_configure = cec_parallel_poll_configure,
.parallel_poll_response = cec_parallel_poll_response,
.local_parallel_poll_mode = NULL, // XXX
- .line_status = NULL, //XXX
+ .line_status = NULL, // XXX
.update_status = cec_update_status,
.primary_address = cec_primary_address,
.secondary_address = cec_secondary_address,

drivers/staging/gpib/common/gpib_os.c

View file
diff --git a/drivers/staging/gpib/common/gpib_os.c b/drivers/staging/gpib/common/gpib_os.c
index 2a0465c..9dbbac8 100644
--- a/drivers/staging/gpib/common/gpib_os.c
+++ b/drivers/staging/gpib/common/gpib_os.c
@@ -326,7 +326,7 @@ static int setup_serial_poll(struct gpib_board *board, unsigned int usec_timeout
cmd_string[i++] = MLA(board->pad); /* controller's listen address */
if (board->sad >= 0)
cmd_string[i++] = MSA(board->sad);
- cmd_string[i++] = SPE; //serial poll enable
+ cmd_string[i++] = SPE; // serial poll enable
ret = board->interface->command(board, cmd_string, i, &bytes_written);
if (ret < 0 || bytes_written < i) {

drivers/staging/gpib/common/iblib.c

View file
diff --git a/drivers/staging/gpib/common/iblib.c b/drivers/staging/gpib/common/iblib.c
index 549280d..7cbb6a4 100644
--- a/drivers/staging/gpib/common/iblib.c
+++ b/drivers/staging/gpib/common/iblib.c
@@ -608,7 +608,7 @@ static int wait_satisfied(struct wait_info *winfo, struct gpib_status_queue *sta
*status = temp_status;
return 1;
}
-//XXX does wait for END work?
+// XXX does wait for END work?
return 0;
}

drivers/staging/gpib/eastwood/fluke_gpib.c

View file
diff --git a/drivers/staging/gpib/eastwood/fluke_gpib.c b/drivers/staging/gpib/eastwood/fluke_gpib.c
index 4913564..3ae848e 100644
--- a/drivers/staging/gpib/eastwood/fluke_gpib.c
+++ b/drivers/staging/gpib/eastwood/fluke_gpib.c
@@ -507,7 +507,7 @@ static int fluke_accel_write(struct gpib_board *board, u8 *buffer, size_t length
}
if (retval < 0)
return retval;
- //handle sending of last byte with eoi
+ // handle sending of last byte with eoi
if (send_eoi) {
size_t num_bytes;

drivers/staging/gpib/fmh_gpib/fmh_gpib.c

View file
diff --git a/drivers/staging/gpib/fmh_gpib/fmh_gpib.c b/drivers/staging/gpib/fmh_gpib/fmh_gpib.c
index 4138f3d..164dcfc 100644
--- a/drivers/staging/gpib/fmh_gpib/fmh_gpib.c
+++ b/drivers/staging/gpib/fmh_gpib/fmh_gpib.c
@@ -523,7 +523,7 @@ static int fmh_gpib_accel_write(struct gpib_board *board, u8 *buffer,
}
if (retval < 0)
return retval;
- //handle sending of last byte with eoi
+ // handle sending of last byte with eoi
if (send_eoi) {
size_t num_bytes;

drivers/staging/gpib/gpio/gpib_bitbang.c

View file
diff --git a/drivers/staging/gpib/gpio/gpib_bitbang.c b/drivers/staging/gpib/gpio/gpib_bitbang.c
index 1788481..374cd61 100644
--- a/drivers/staging/gpib/gpio/gpib_bitbang.c
+++ b/drivers/staging/gpib/gpio/gpib_bitbang.c
@@ -277,8 +277,8 @@ struct bb_priv {
int ndac_mode; /* nrfd interrupt mode 0/1 -> edge/levels */
int dav_tx; /* keep trace of DAV status while sending */
int dav_rx; /* keep trace of DAV status while receiving */
- u8 eos; // eos character
- short eos_flags; // eos mode
+ u8 eos; /* eos character */
+ short eos_flags; /* eos mode */
short eos_check; /* eos check required in current operation ... */
short eos_check_8; /* ... with byte comparison */
short eos_mask_7; /* ... with 7 bit masked character */
@@ -290,14 +290,14 @@ struct bb_priv {
u8 *rbuf;
u8 *wbuf;
int end_flag;
- int r_busy; /* 0==idle 1==busy */
+ int r_busy; /* 0==idle 1==busy */
int w_busy;
int write_done;
- int cmd; /* 1 = cmd write in progress */
+ int cmd; /* 1 = cmd write in progress */
size_t w_cnt;
size_t length;
u8 *w_buf;
- spinlock_t rw_lock; // protect mods to rw_lock
+ spinlock_t rw_lock; /* protect mods to rw_lock */
int phase;
int ndac_idle;
int ndac_seq;
@@ -726,7 +726,7 @@ static irqreturn_t bb_SRQ_interrupt(int irq, void *arg)
static int bb_command(struct gpib_board *board, u8 *buffer,
size_t length, size_t *bytes_written)
{
- size_t ret;
+ int ret;
struct bb_priv *priv = board->private_data;
int i;
@@ -1462,8 +1462,8 @@ static inline void SET_DIR_READ(struct bb_priv *priv)
gpiod_set_value(TE, 0); /* set NDAC and NRFD to transmit and DAV to receive */
}
- gpiod_direction_output(NRFD, 0); // hold off the talker
- gpiod_direction_output(NDAC, 0); // data not accepted
+ gpiod_direction_output(NRFD, 0); /* hold off the talker */
+ gpiod_direction_output(NDAC, 0); /* data not accepted */
priv->direction = DIR_READ;
}

drivers/staging/gpib/hp_82341/hp_82341.c

View file
diff --git a/drivers/staging/gpib/hp_82341/hp_82341.c b/drivers/staging/gpib/hp_82341/hp_82341.c
index e5c1997..1a2ad05 100644
--- a/drivers/staging/gpib/hp_82341/hp_82341.c
+++ b/drivers/staging/gpib/hp_82341/hp_82341.c
@@ -38,7 +38,7 @@ static int hp_82341_accel_read(struct gpib_board *board, u8 *buffer, size_t leng
unsigned short event_status;
int i;
int num_fifo_bytes;
- //hardware doesn't support checking for end-of-string character when using fifo
+ // hardware doesn't support checking for end-of-string character when using fifo
if (tms_priv->eos_flags & REOS)
return tms9914_read(board, tms_priv, buffer, length, end, bytes_read);
@@ -49,7 +49,7 @@ static int hp_82341_accel_read(struct gpib_board *board, u8 *buffer, size_t leng
*bytes_read = 0;
if (length == 0)
return 0;
- //disable fifo for the moment
+ // disable fifo for the moment
outb(DIRECTION_GPIB_TO_HOST_BIT, hp_priv->iobase[3] + BUFFER_CONTROL_REG);
/*
* Handle corner case of board not in holdoff and one byte has slipped in already.
@@ -154,7 +154,7 @@ static int restart_write_fifo(struct gpib_board *board, struct hp_82341_priv *hp
while (1) {
int status;
- //restart doesn't work if data holdoff is in effect
+ // restart doesn't work if data holdoff is in effect
status = tms9914_line_status(board, tms_priv);
if ((status & BUS_NRFD) == 0) {
outb(RESTART_STREAM_BIT, hp_priv->iobase[0] + STREAM_STATUS_REG);
@@ -764,7 +764,7 @@ static int hp_82341_attach(struct gpib_board *board, const struct gpib_board_con
ENABLE_TI_INTERRUPT_EVENT_BIT, hp_priv->iobase[0] + EVENT_ENABLE_REG);
outb(ENABLE_BUFFER_END_INTERRUPT_BIT | ENABLE_TERMINAL_COUNT_INTERRUPT_BIT |
ENABLE_TI_INTERRUPT_BIT, hp_priv->iobase[0] + INTERRUPT_ENABLE_REG);
- //write clear event register
+ // write clear event register
outb((TI_INTERRUPT_EVENT_BIT | POINTERS_EQUAL_EVENT_BIT |
BUFFER_END_EVENT_BIT | TERMINAL_COUNT_EVENT_BIT),
hp_priv->iobase[0] + EVENT_STATUS_REG);
@@ -867,7 +867,7 @@ static irqreturn_t hp_82341_interrupt(int irq, void *arg)
event_status = inb(hp_priv->iobase[0] + EVENT_STATUS_REG);
if (event_status & INTERRUPT_PENDING_EVENT_BIT)
retval = IRQ_HANDLED;
- //write-clear status bits
+ // write-clear status bits
if (event_status & (TI_INTERRUPT_EVENT_BIT | POINTERS_EQUAL_EVENT_BIT |
BUFFER_END_EVENT_BIT | TERMINAL_COUNT_EVENT_BIT)) {
outb(event_status & (TI_INTERRUPT_EVENT_BIT | POINTERS_EQUAL_EVENT_BIT |
@@ -901,7 +901,7 @@ static void set_transfer_counter(struct hp_82341_priv *hp_priv, int count)
outb(complement & 0xff, hp_priv->iobase[1] + TRANSFER_COUNT_LOW_REG);
outb((complement >> 8) & 0xff, hp_priv->iobase[1] + TRANSFER_COUNT_MID_REG);
- //I don't think the hi count reg is even used, but oh well
+ // I don't think the hi count reg is even used, but oh well
outb((complement >> 16) & 0xf, hp_priv->iobase[1] + TRANSFER_COUNT_HIGH_REG);
}

drivers/staging/gpib/hp_82341/hp_82341.h

View file
diff --git a/drivers/staging/gpib/hp_82341/hp_82341.h b/drivers/staging/gpib/hp_82341/hp_82341.h
index 370a3d4..859ef28 100644
--- a/drivers/staging/gpib/hp_82341/hp_82341.h
+++ b/drivers/staging/gpib/hp_82341/hp_82341.h
@@ -65,7 +65,7 @@ enum config_control_status_bits {
IRQ_SELECT_MASK = 0x7,
DMA_CONFIG_MASK = 0x18,
ENABLE_DMA_CONFIG_BIT = 0x20,
- XILINX_READY_BIT = 0x40, //read only
+ XILINX_READY_BIT = 0x40, // read only
DONE_PGL_BIT = 0x80
};
@@ -94,7 +94,7 @@ static inline unsigned int IRQ_SELECT_BITS(int irq)
};
enum mode_control_status_bits {
- SLOT8_BIT = 0x1, // read only
+ SLOT8_BIT = 0x1, // read only
ACTIVE_CONTROLLER_BIT = 0x2, // read only
ENABLE_DMA_BIT = 0x4,
SYSTEM_CONTROLLER_BIT = 0x8,
@@ -106,12 +106,12 @@ enum mode_control_status_bits {
enum monitor_bits {
MONITOR_INTERRUPT_PENDING_BIT = 0x1, // read only
MONITOR_CLEAR_HOLDOFF_BIT = 0x2, // write only
- MONITOR_PPOLL_BIT = 0x4, // write clear
- MONITOR_SRQ_BIT = 0x8, // write clear
- MONITOR_IFC_BIT = 0x10, // write clear
- MONITOR_REN_BIT = 0x20, // write clear
- MONITOR_END_BIT = 0x40, // write clear
- MONITOR_DAV_BIT = 0x80 // write clear
+ MONITOR_PPOLL_BIT = 0x4, // write clear
+ MONITOR_SRQ_BIT = 0x8, // write clear
+ MONITOR_IFC_BIT = 0x10, // write clear
+ MONITOR_REN_BIT = 0x20, // write clear
+ MONITOR_END_BIT = 0x40, // write clear
+ MONITOR_DAV_BIT = 0x80 // write clear
};
enum interrupt_enable_bits {
@@ -123,36 +123,36 @@ enum interrupt_enable_bits {
};
enum event_status_bits {
- TI_INTERRUPT_EVENT_BIT = 0x1, //write clear
+ TI_INTERRUPT_EVENT_BIT = 0x1, // write clear
INTERRUPT_PENDING_EVENT_BIT = 0x2, // read only
- POINTERS_EQUAL_EVENT_BIT = 0x4, //write clear
- BUFFER_END_EVENT_BIT = 0x10, //write clear
+ POINTERS_EQUAL_EVENT_BIT = 0x4, // write clear
+ BUFFER_END_EVENT_BIT = 0x10, // write clear
TERMINAL_COUNT_EVENT_BIT = 0x20, // write clear
DMA_TERMINAL_COUNT_EVENT_BIT = 0x80, // write clear
};
enum event_enable_bits {
- ENABLE_TI_INTERRUPT_EVENT_BIT = 0x1, //write clear
- ENABLE_POINTERS_EQUAL_EVENT_BIT = 0x4, //write clear
- ENABLE_BUFFER_END_EVENT_BIT = 0x10, //write clear
- ENABLE_TERMINAL_COUNT_EVENT_BIT = 0x20, // write clear
+ ENABLE_TI_INTERRUPT_EVENT_BIT = 0x1, // write clear
+ ENABLE_POINTERS_EQUAL_EVENT_BIT = 0x4, // write clear
+ ENABLE_BUFFER_END_EVENT_BIT = 0x10, // write clear
+ ENABLE_TERMINAL_COUNT_EVENT_BIT = 0x20, // write clear
ENABLE_DMA_TERMINAL_COUNT_EVENT_BIT = 0x80, // write clear
};
enum stream_status_bits {
- HALTED_STATUS_BIT = 0x1, //read
- RESTART_STREAM_BIT = 0x1 //write
+ HALTED_STATUS_BIT = 0x1, // read
+ RESTART_STREAM_BIT = 0x1 // write
};
enum buffer_control_bits {
DIRECTION_GPIB_TO_HOST_BIT = 0x20, // transfer direction (set for gpib to host)
- ENABLE_TI_BUFFER_BIT = 0x40, //enable fifo
- FAST_WR_EN_BIT = 0x80, // 350 ns t1 delay?
+ ENABLE_TI_BUFFER_BIT = 0x40, // enable fifo
+ FAST_WR_EN_BIT = 0x80, // 350 ns t1 delay?
};
// registers accessible through isapnp chip on 82341d
enum hp_82341d_pnp_registers {
- PIO_DATA_REG = 0x20, //read/write pio data lines
+ PIO_DATA_REG = 0x20, // read/write pio data lines
PIO_DIRECTION_REG = 0x21, // set pio data line directions (set for input)
};

drivers/staging/gpib/include/amccs5933.h

View file
diff --git a/drivers/staging/gpib/include/amccs5933.h b/drivers/staging/gpib/include/amccs5933.h
index 4de0f67..d7f63c7 100644
--- a/drivers/staging/gpib/include/amccs5933.h
+++ b/drivers/staging/gpib/include/amccs5933.h
@@ -24,7 +24,7 @@ extern inline int INCOMING_MAILBOX_REG(unsigned int mailbox)
enum {
OUTBOX_EMPTY_INTR_BIT = 0x10, // enable outbox empty interrupt
INBOX_FULL_INTR_BIT = 0x1000, // enable inbox full interrupt
- INBOX_INTR_CS_BIT = 0x20000, // read, or write clear inbox full interrupt
+ INBOX_INTR_CS_BIT = 0x20000, // read, or write clear inbox full interrupt
INTR_ASSERTED_BIT = 0x800000, // read only, interrupt asserted
};
@@ -52,7 +52,7 @@ extern inline int OUTBOX_SELECT_BITS(unsigned int mailbox)
return (mailbox & 0x3) << 2;
};
-//BMCSR bits
+// BMCSR bits
enum {
MBOX_FLAGS_RESET_BIT = 0x08000000, // resets mailbox empty/full flags
};

drivers/staging/gpib/include/gpib_types.h

View file
diff --git a/drivers/staging/gpib/include/gpib_types.h b/drivers/staging/gpib/include/gpib_types.h
index db040c8..998abb3 100644
--- a/drivers/staging/gpib/include/gpib_types.h
+++ b/drivers/staging/gpib/include/gpib_types.h
@@ -273,7 +273,8 @@ struct gpib_board {
struct mutex big_gpib_mutex;
/* pid of last process to lock the board mutex */
pid_t locking_pid;
- spinlock_t locking_pid_spinlock; // lock for setting locking pid
+ /* lock for setting locking pid */
+ spinlock_t locking_pid_spinlock;
/* Spin lock for dealing with races with the interrupt handler */
spinlock_t spinlock;
/* Watchdog timer to enable timeouts */

drivers/staging/gpib/include/nec7210.h

View file
diff --git a/drivers/staging/gpib/include/nec7210.h b/drivers/staging/gpib/include/nec7210.h
index 312217b..9835aa5 100644
--- a/drivers/staging/gpib/include/nec7210.h
+++ b/drivers/staging/gpib/include/nec7210.h
@@ -22,18 +22,18 @@ struct nec7210_priv {
u32 iobase;
#endif
void __iomem *mmiobase;
- unsigned int offset; // offset between successive nec7210 io addresses
+ unsigned int offset; // offset between successive nec7210 io addresses
unsigned int dma_channel;
u8 *dma_buffer;
unsigned int dma_buffer_length; // length of dma buffer
dma_addr_t dma_buffer_addr; // bus address of board->buffer for use with dma
// software copy of bits written to registers
u8 reg_bits[8];
- u8 auxa_bits; // bits written to auxiliary register A
- u8 auxb_bits; // bits written to auxiliary register B
+ u8 auxa_bits; // bits written to auxiliary register A
+ u8 auxb_bits; // bits written to auxiliary register B
// used to keep track of board's state, bit definitions given below
unsigned long state;
- /* lock for chips that extend the nec7210 registers by paging in alternate regs */
+ // lock for chips that extend the nec7210 registers by paging in alternate regs
spinlock_t register_page_lock;
// wrappers for outb, inb, readb, or writeb
u8 (*read_byte)(struct nec7210_priv *priv, unsigned int register_number);
@@ -64,17 +64,17 @@ static inline void write_byte(struct nec7210_priv *priv, u8 byte, unsigned int r
// struct nec7210_priv.state bit numbers
enum {
- PIO_IN_PROGRESS_BN, // pio transfer in progress
+ PIO_IN_PROGRESS_BN, // pio transfer in progress
DMA_READ_IN_PROGRESS_BN, // dma read transfer in progress
DMA_WRITE_IN_PROGRESS_BN, // dma write transfer in progress
- READ_READY_BN, // board has data byte available to read
- WRITE_READY_BN, // board is ready to send a data byte
- COMMAND_READY_BN, // board is ready to send a command byte
- RECEIVED_END_BN, // received END
- BUS_ERROR_BN, // output error has occurred
- RFD_HOLDOFF_BN, // rfd holdoff in effect
- DEV_CLEAR_BN, // device clear received
- ADR_CHANGE_BN, // address state change occurred
+ READ_READY_BN, // board has data byte available to read
+ WRITE_READY_BN, // board is ready to send a data byte
+ COMMAND_READY_BN, // board is ready to send a command byte
+ RECEIVED_END_BN, // received END
+ BUS_ERROR_BN, // output error has occurred
+ RFD_HOLDOFF_BN, // rfd holdoff in effect
+ DEV_CLEAR_BN, // device clear received
+ ADR_CHANGE_BN, // address state change occurred
};
// interface functions

drivers/staging/gpib/include/nec7210_registers.h

View file
diff --git a/drivers/staging/gpib/include/nec7210_registers.h b/drivers/staging/gpib/include/nec7210_registers.h
index 97c53ac..067983d 100644
--- a/drivers/staging/gpib/include/nec7210_registers.h
+++ b/drivers/staging/gpib/include/nec7210_registers.h
@@ -11,7 +11,7 @@ enum nec7210_chipset {
NEC7210, // The original
TNT4882, // NI
NAT4882, // NI
- CB7210, // measurement computing
+ CB7210, // measurement computing
IOT7210, // iotech
IGPIB7210, // Ines

This diff is incomplete. Download the complete patch.

drivers/staging/gpib/include/plx9050.h

View file

This diff is incomplete. Download the complete patch.

drivers/staging/gpib/include/tms9914.h

View file

This diff is incomplete. Download the complete patch.

drivers/staging/gpib/include/tnt4882_registers.h

View file

This diff is incomplete. Download the complete patch.

drivers/staging/gpib/ines/ines.h

View file

This diff is incomplete. Download the complete patch.

drivers/staging/gpib/ines/ines_gpib.c

View file

This diff is incomplete. Download the complete patch.

drivers/staging/gpib/nec7210/nec7210.c

View file

This diff is incomplete. Download the complete patch.

drivers/staging/gpib/ni_usb/ni_usb_gpib.c

View file

This diff is incomplete. Download the complete patch.

drivers/staging/gpib/ni_usb/ni_usb_gpib.h

View file

This diff is incomplete. Download the complete patch.

drivers/staging/gpib/pc2/pc2_gpib.c

View file

This diff is incomplete. Download the complete patch.

drivers/staging/gpib/tms9914/tms9914.c

View file

This diff is incomplete. Download the complete patch.

drivers/staging/gpib/tnt4882/mite.h

View file

This diff is incomplete. Download the complete patch.

drivers/staging/gpib/tnt4882/tnt4882_gpib.c

View file

This diff is incomplete. Download the complete patch.

drivers/staging/octeon/ethernet-tx.c

View file

This diff is incomplete. Download the complete patch.

drivers/staging/octeon/octeon-stubs.h

View file

This diff is incomplete. Download the complete patch.

drivers/staging/rtl8723bs/Makefile

View file

This diff is incomplete. Download the complete patch.

drivers/staging/rtl8723bs/core/rtw_ap.c

View file

This diff is incomplete. Download the complete patch.

drivers/staging/rtl8723bs/core/rtw_efuse.c

View file

This diff is incomplete. Download the complete patch.

drivers/staging/rtl8723bs/core/rtw_mlme.c

View file

This diff is incomplete. Download the complete patch.

drivers/staging/rtl8723bs/core/rtw_mlme_ext.c

View file

This diff is incomplete. Download the complete patch.

drivers/staging/rtl8723bs/core/rtw_pwrctrl.c

View file

This diff is incomplete. Download the complete patch.

drivers/staging/rtl8723bs/core/rtw_recv.c

View file

This diff is incomplete. Download the complete patch.

drivers/staging/rtl8723bs/core/rtw_security.c

View file

This diff is incomplete. Download the complete patch.

drivers/staging/rtl8723bs/core/rtw_sta_mgt.c

View file

This diff is incomplete. Download the complete patch.

drivers/staging/rtl8723bs/core/rtw_wlan_util.c

View file

This diff is incomplete. Download the complete patch.

drivers/staging/rtl8723bs/core/rtw_xmit.c

View file

This diff is incomplete. Download the complete patch.

drivers/staging/rtl8723bs/hal/hal_com_phycfg.c

View file

This diff is incomplete. Download the complete patch.

drivers/staging/rtl8723bs/hal/hal_pwr_seq.c

View file

This diff is incomplete. Download the complete patch.

drivers/staging/rtl8723bs/hal/odm.c

View file

This diff is incomplete. Download the complete patch.

drivers/staging/rtl8723bs/hal/odm.h

View file

This diff is incomplete. Download the complete patch.

drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c

View file

This diff is incomplete. Download the complete patch.

drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c

View file

This diff is incomplete. Download the complete patch.

drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c

View file

This diff is incomplete. Download the complete patch.

drivers/staging/rtl8723bs/hal/sdio_halinit.c

View file

This diff is incomplete. Download the complete patch.

drivers/staging/rtl8723bs/include/basic_types.h

View file

This diff is incomplete. Download the complete patch.

drivers/staging/rtl8723bs/include/drv_types.h

View file

This diff is incomplete. Download the complete patch.

drivers/staging/rtl8723bs/include/hal_intf.h

View file

This diff is incomplete. Download the complete patch.

drivers/staging/rtl8723bs/include/mlme_osdep.h

View before deletion

This diff is incomplete. Download the complete patch.

drivers/staging/rtl8723bs/include/recv_osdep.h

View before deletion

This diff is incomplete. Download the complete patch.

drivers/staging/rtl8723bs/include/rtl8723b_hal.h

View file

This diff is incomplete. Download the complete patch.

drivers/staging/rtl8723bs/include/rtw_efuse.h

View file

This diff is incomplete. Download the complete patch.

drivers/staging/rtl8723bs/include/rtw_mlme.h

View file

This diff is incomplete. Download the complete patch.

drivers/staging/rtl8723bs/include/rtw_mlme_ext.h

View file

This diff is incomplete. Download the complete patch.

drivers/staging/rtl8723bs/include/rtw_recv.h

View file

This diff is incomplete. Download the complete patch.

drivers/staging/rtl8723bs/os_dep/mlme_linux.c

View before deletion

This diff is incomplete. Download the complete patch.

drivers/staging/rtl8723bs/os_dep/recv_linux.c

View before deletion

This diff is incomplete. Download the complete patch.

drivers/staging/sm750fb/sm750.h

View file

This diff is incomplete. Download the complete patch.

drivers/staging/sm750fb/sm750_accel.c

View file

This diff is incomplete. Download the complete patch.

drivers/staging/sm750fb/sm750_hw.c

View file

This diff is incomplete. Download the complete patch.

drivers/staging/vc04_services/vchiq-mmal/mmal-msg.h

View file

This diff is incomplete. Download the complete patch.

drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c

View file

This diff is incomplete. Download the complete patch.

drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.h

View file

This diff is incomplete. Download the complete patch.