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

Merge tag 'staging-6.15-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 and updates for
  6.15-rc1.

  As expected, with the introduction of the gpib drivers, loads of
  cleanups and fixes showed up, with the huge majority of changes being
  for that chunk of drivers. This is good and shows that the community
  can fix up things in public when asked to. Also included in here are:

   - small sm750fb cleanups

   - tiny rtl8723bs cleanups

   - more vchiq_arm cleanups and changes, hopefully this will get out of
     staging soon

  All of these have been in linux-next for almost 2 weeks now with no
  reported issues"

* tag 'staging-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (76 commits)
  staging: rtl8723bs: fixed a unnecessary parentheses coding style issue
  staging: vchiq_arm: Improve initial VCHIQ connect
  staging: vchiq_arm: Create keep-alive thread during probe
  staging: vchiq_arm: Stop kthreads if vchiq cdev register fails
  staging: vchiq_arm: Fix possible NPR of keep-alive thread
  staging: vchiq_arm: Register debugfs after cdev
  staging: vchiq_arm: Don't use %pK through printk
  staging: rtl8723bs: select CONFIG_CRYPTO_LIB_AES
  staging: rtl8723bs: Remove some unused functions, macros, and structs
  staging: gpib: change return type of t1_delay function to report errors
  staging: gpib: remove commented-out lines
  staging: gpib: fix kernel-doc section for usb_gpib_line_status() function
  staging: gpib: fix kernel-doc section for function usb_gpib_interface_clear()
  staging: gpib: fix kernel-doc section for write_loop() function
  staging: gpib: Removing typedef for gpib_board
  staging: gpib: struct typing for gpib_gboard_t
  staging: gpib: tnt4882: struct gpib_board
  staging: gpib: tms9914: struct gpib_board
  staging: gpib: pc2: struct gpib_board
  staging: gpib: ni_usb_gpib: struct gpib_board
  ...
parents a0935e4c 3b23d31e

drivers/pnp/isapnp/core.c

+1 −0
Original line number Diff line number Diff line
@@ -843,6 +843,7 @@ EXPORT_SYMBOL(isapnp_protocol); 
EXPORT_SYMBOL(isapnp_present);

EXPORT_SYMBOL(isapnp_cfg_begin);

EXPORT_SYMBOL(isapnp_cfg_end);

EXPORT_SYMBOL(isapnp_read_byte);

EXPORT_SYMBOL(isapnp_write_byte);



static int isapnp_get_resources(struct pnp_dev *dev)

drivers/staging/gpib/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ config GPIB_CEC_PCI 
	tristate "CEC PCI board"

	depends on PCI

	depends on HAS_IOPORT

	depends on !X86_PAE

	select GPIB_COMMON

	select GPIB_NEC7210

	help
@@ -64,7 +63,6 @@ config GPIB_NI_PCI_ISA 
	tristate "NI PCI/ISA compatible boards"

	depends on ISA_BUS || PCI || PCMCIA

	depends on HAS_IOPORT

	depends on !X86_PAE

	depends on PCMCIA || !PCMCIA

	depends on HAS_IOPORT_MAP

	select GPIB_COMMON
@@ -90,7 +88,6 @@ config GPIB_CB7210 
       tristate "Measurement Computing compatible boards"

	depends on HAS_IOPORT

	depends on ISA_BUS || PCI || PCMCIA

	depends on !X86_PAE

	depends on PCMCIA || !PCMCIA

       select GPIB_COMMON

	select GPIB_NEC7210
@@ -169,7 +166,6 @@ config GPIB_HP82341 
       tristate "HP82341x"

       select GPIB_COMMON

       select GPIB_TMS9914

       depends on BROKEN

       depends on ISA_BUS || EISA

       help

         GPIB driver for HP82341 A/B/C/D boards
@@ -182,7 +178,6 @@ config GPIB_INES 
	depends on PCI || ISA_BUS || PCMCIA

	depends on PCMCIA || !PCMCIA

	depends on HAS_IOPORT

	depends on !X86_PAE

       select GPIB_COMMON

       select GPIB_NEC7210

       help

drivers/staging/gpib/agilent_82350b/agilent_82350b.c

+104 −156

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/gpib/agilent_82350b/agilent_82350b.h

+0 −50
Original line number Diff line number Diff line
@@ -57,56 +57,6 @@ struct agilent_82350b_priv { 
	bool using_fifos;

};



// driver name

extern const char *driver_name;



// init functions



int agilent_82350b_unaccel_attach(gpib_board_t *board, const gpib_board_config_t *config);

int agilent_82350b_accel_attach(gpib_board_t *board, const gpib_board_config_t *config);



// interface functions

int agilent_82350b_accel_read(gpib_board_t *board, uint8_t *buffer, size_t length, int *end,

			      size_t *bytes_read);

int agilent_82350b_accel_write(gpib_board_t *board, uint8_t *buffer, size_t length, int send_eoi,

			       size_t *bytes_written);

int agilent_82350b_read(gpib_board_t *board, uint8_t *buffer, size_t length, int *end,

			size_t *bytes_read);

int agilent_82350b_write(gpib_board_t *board, uint8_t *buffer, size_t length, int send_eoi,

			 size_t *bytes_written);

int agilent_82350b_command(gpib_board_t *board, uint8_t *buffer, size_t length,

			   size_t *bytes_written);

int agilent_82350b_take_control(gpib_board_t *board, int synchronous);

int agilent_82350b_go_to_standby(gpib_board_t *board);

void agilent_82350b_request_system_control(gpib_board_t *board, int request_control);

void agilent_82350b_interface_clear(gpib_board_t *board, int assert);

void agilent_82350b_remote_enable(gpib_board_t *board, int enable);

int agilent_82350b_enable_eos(gpib_board_t *board, uint8_t eos_byte, int

			compare_8_bits);

void agilent_82350b_disable_eos(gpib_board_t *board);

unsigned int agilent_82350b_update_status(gpib_board_t *board, unsigned int clear_mask);

int agilent_82350b_primary_address(gpib_board_t *board, unsigned int address);

int agilent_82350b_secondary_address(gpib_board_t *board, unsigned int address, int

				enable);

int agilent_82350b_parallel_poll(gpib_board_t *board, uint8_t *result);

void agilent_82350b_parallel_poll_configure(gpib_board_t *board, uint8_t config);

void agilent_82350b_parallel_poll_response(gpib_board_t *board, int ist);

void agilent_82350b_serial_poll_response(gpib_board_t *board, uint8_t status);

void agilent_82350b_return_to_local(gpib_board_t *board);

uint8_t agilent_82350b_serial_poll_status(gpib_board_t *board);

int agilent_82350b_line_status(const gpib_board_t *board);

unsigned int agilent_82350b_t1_delay(gpib_board_t *board, unsigned int nanosec);



// interrupt service routines

irqreturn_t agilent_82350b_interrupt(int irq, void *arg);



// utility functions

int agilent_82350b_allocate_private(gpib_board_t *board);

void agilent_82350b_free_private(gpib_board_t *board);

unsigned short read_and_clear_event_status(gpib_board_t *board);

int read_transfer_counter(struct agilent_82350b_priv *a_priv);

void set_transfer_counter(struct agilent_82350b_priv *a_priv, int count);



//registers

enum agilent_82350b_gpib_registers

drivers/staging/gpib/agilent_82357a/agilent_82357a.c

+253 −274

File changed.

Preview size limit exceeded, changes collapsed.