staging: gpib: Add return value to request_control

A number of drivers are unable to release control due to hardware or
software limitations. As request_system_control was defined as void,
no error could be signalled.

This patch changes the prototype of request_system_control to int and
adds the appropriate checking and returns. In the case that a board
cannot release control EINVAL is returned.  If a driver does not
implement request_system_control EPERM is returned.

Signed-off-by: Dave Penkler <dpenkler@gmail.com>
Link: https://lore.kernel.org/r/20250418133537.22491-1-dpenkler@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/gpib/agilent_82350b/agilent_82350b.c b/drivers/staging/gpib/agilent_82350b/agilent_82350b.c
index 14ff7f19c8f7841bf1cfd30b577d6a3813d27e40..94bbb3b6576d9b8ed7c2e989e652905bb534d8b7 100644 (file)
--- a/drivers/staging/gpib/agilent_82350b/agilent_82350b.c
+++ b/drivers/staging/gpib/agilent_82350b/agilent_82350b.c
@@ -341,9 +341,7 @@ static int agilent_82350b_go_to_standby(struct gpib_board *board)
        return tms9914_go_to_standby(board, &priv->tms9914_priv);
 }
 
-static void agilent_82350b_request_system_control(struct gpib_board *board,
-                                                 int request_control)
-
+static int agilent_82350b_request_system_control(struct gpib_board *board, int request_control)
 {
        struct agilent_82350b_priv *a_priv = board->private_data;
 
@@ -357,7 +355,7 @@ static void agilent_82350b_request_system_control(struct gpib_board *board,
                        writeb(0, a_priv->gpib_base + INTERNAL_CONFIG_REG);
        }
        writeb(a_priv->card_mode_bits, a_priv->gpib_base + CARD_MODE_REG);
-       tms9914_request_system_control(board, &a_priv->tms9914_priv, request_control);
+       return tms9914_request_system_control(board, &a_priv->tms9914_priv, request_control);
 }
 
 static void agilent_82350b_interface_clear(struct gpib_board *board, int assert)

diff --git a/drivers/staging/gpib/agilent_82357a/agilent_82357a.c b/drivers/staging/gpib/agilent_82357a/agilent_82357a.c
index 4728ec85caa8228a0acb261fc30e640ba781cf55..454d46b8b6771e68daf482ecee1f6b08881c1ffe 100644 (file)
--- a/drivers/staging/gpib/agilent_82357a/agilent_82357a.c
+++ b/drivers/staging/gpib/agilent_82357a/agilent_82357a.c
@@ -756,9 +756,7 @@ static int agilent_82357a_go_to_standby(struct gpib_board *board)
        return 0;
 }
 
-//FIXME should change prototype to return int
-static void agilent_82357a_request_system_control(struct gpib_board *board,
-                                                 int request_control)
+static int agilent_82357a_request_system_control(struct gpib_board *board, int request_control)
 {
        struct agilent_82357a_priv *a_priv = board->private_data;
        struct usb_device *usb_dev;
@@ -767,7 +765,7 @@ static void agilent_82357a_request_system_control(struct gpib_board *board,
        int i = 0;
 
        if (!a_priv->bus_interface)
-               return; // -ENODEV;
+               return -ENODEV;
 
        usb_dev = interface_to_usbdev(a_priv->bus_interface);
        /* 82357B needs bit to be set in 9914 AUXCR register */
@@ -776,9 +774,7 @@ static void agilent_82357a_request_system_control(struct gpib_board *board,
                writes[i].value = AUX_RQC;
                a_priv->hw_control_bits |= SYSTEM_CONTROLLER;
        } else {
-               writes[i].value = AUX_RLC;
-               a_priv->is_cic = 0;
-               a_priv->hw_control_bits &= ~SYSTEM_CONTROLLER;
+               return -EINVAL;
        }
        ++i;
        writes[i].address = HW_CONTROL;
@@ -787,7 +783,7 @@ static void agilent_82357a_request_system_control(struct gpib_board *board,
        retval = agilent_82357a_write_registers(a_priv, writes, i);
        if (retval)
                dev_err(&usb_dev->dev, "write_registers() returned error\n");
-       return;// retval;
+       return retval;
 }
 
 static void agilent_82357a_interface_clear(struct gpib_board *board, int assert)
@@ -1593,7 +1589,7 @@ static int agilent_82357a_driver_resume(struct usb_interface *interface)
 {
        struct usb_device *usb_dev = interface_to_usbdev(interface);
        struct gpib_board *board;
-       int i, retval;
+       int i, retval = 0;
 
        mutex_lock(&agilent_82357a_hotplug_lock);
 
@@ -1604,8 +1600,10 @@ static int agilent_82357a_driver_resume(struct usb_interface *interface)
                                break;
                }
        }
-       if (i == MAX_NUM_82357A_INTERFACES)
+       if (i == MAX_NUM_82357A_INTERFACES) {
+               retval = -ENOENT;
                goto resume_exit;
+       }
 
        struct agilent_82357a_priv *a_priv = board->private_data;
 
@@ -1628,7 +1626,7 @@ static int agilent_82357a_driver_resume(struct usb_interface *interface)
                        return retval;
                }
                // set/unset system controller
-               agilent_82357a_request_system_control(board, board->master);
+               retval = agilent_82357a_request_system_control(board, board->master);
                // toggle ifc if master
                if (board->master) {
                        agilent_82357a_interface_clear(board, 1);
@@ -1646,7 +1644,7 @@ static int agilent_82357a_driver_resume(struct usb_interface *interface)
 resume_exit:
        mutex_unlock(&agilent_82357a_hotplug_lock);
 
-       return 0;
+       return retval;
 }
 
 static struct usb_driver agilent_82357a_bus_driver = {

diff --git a/drivers/staging/gpib/cb7210/cb7210.c b/drivers/staging/gpib/cb7210/cb7210.c
index 54c037aabc264afe31c73912b2852199c28fc386..c686896bb088dcd834275fa3f0c252752bcf03bb 100644 (file)
--- a/drivers/staging/gpib/cb7210/cb7210.c
+++ b/drivers/staging/gpib/cb7210/cb7210.c
@@ -578,7 +578,7 @@ static int cb7210_go_to_standby(struct gpib_board *board)
        return nec7210_go_to_standby(board, &priv->nec7210_priv);
 }
 
-static void cb7210_request_system_control(struct gpib_board *board, int request_control)
+static int cb7210_request_system_control(struct gpib_board *board, int request_control)
 {
        struct cb7210_priv *priv = board->private_data;
        struct nec7210_priv *nec_priv = &priv->nec7210_priv;
@@ -589,7 +589,7 @@ static void cb7210_request_system_control(struct gpib_board *board, int request_
                priv->hs_mode_bits &= ~HS_SYS_CONTROL;
 
        cb7210_write_byte(priv, priv->hs_mode_bits, HS_MODE);
-       nec7210_request_system_control(board, nec_priv, request_control);
+       return nec7210_request_system_control(board, nec_priv, request_control);
 }
 
 static void cb7210_interface_clear(struct gpib_board *board, int assert)

diff --git a/drivers/staging/gpib/cec/cec_gpib.c b/drivers/staging/gpib/cec/cec_gpib.c
index 737d78736ea509065e77a1d95dcd123150044d68..e8736cbf50e36401fe61109b8e302b03b566955f 100644 (file)
--- a/drivers/staging/gpib/cec/cec_gpib.c
+++ b/drivers/staging/gpib/cec/cec_gpib.c
@@ -83,11 +83,11 @@ static int cec_go_to_standby(struct gpib_board *board)
        return nec7210_go_to_standby(board, &priv->nec7210_priv);
 }
 
-static void cec_request_system_control(struct gpib_board *board, int request_control)
+static int cec_request_system_control(struct gpib_board *board, int request_control)
 {
        struct cec_priv *priv = board->private_data;
 
-       nec7210_request_system_control(board, &priv->nec7210_priv, request_control);
+       return nec7210_request_system_control(board, &priv->nec7210_priv, request_control);
 }
 
 static void cec_interface_clear(struct gpib_board *board, int assert)

diff --git a/drivers/staging/gpib/common/gpib_os.c b/drivers/staging/gpib/common/gpib_os.c
index 163d9a64e7df3d8c30f0f28e6ac090c7f358e15b..d87025aadcccdf3b231f5f64b77647fd383176aa 100644 (file)
--- a/drivers/staging/gpib/common/gpib_os.c
+++ b/drivers/staging/gpib/common/gpib_os.c
@@ -1988,9 +1988,7 @@ static int request_system_control_ioctl(struct gpib_board *board, unsigned long
        if (retval)
                return -EFAULT;
 
-       ibrsc(board, request_control);
-
-       return 0;
+       return ibrsc(board, request_control);
 }
 
 static int t1_delay_ioctl(struct gpib_board *board, unsigned long arg)

diff --git a/drivers/staging/gpib/common/iblib.c b/drivers/staging/gpib/common/iblib.c
index a8a215d4ffe4378368cc59f89907eeb7b5da3d87..7a44517464ab6030bc50a9ce54c88682cb3ce0ec 100644 (file)
--- a/drivers/staging/gpib/common/iblib.c
+++ b/drivers/staging/gpib/common/iblib.c
@@ -422,12 +422,21 @@ int ibsic(struct gpib_board *board, unsigned int usec_duration)
        return 0;
 }
 
-       /* FIXME make int */
-void ibrsc(struct gpib_board *board, int request_control)
+int ibrsc(struct gpib_board *board, int request_control)
 {
+       int retval;
+
+       if (!board->interface->request_system_control)
+               return -EPERM;
+
+       retval = board->interface->request_system_control(board, request_control);
+
+       if (retval)
+               return retval;
+
        board->master = request_control != 0;
-       if (board->interface->request_system_control)
-               board->interface->request_system_control(board, request_control);
+
+       return  0;
 }
 
 /*

diff --git a/drivers/staging/gpib/eastwood/fluke_gpib.c b/drivers/staging/gpib/eastwood/fluke_gpib.c
index f6a84200e3a1e91df9f4f0b2ba1892ae0ce6964e..491356433249ec2c715f251870d8d7f2a1196bbc 100644 (file)
--- a/drivers/staging/gpib/eastwood/fluke_gpib.c
+++ b/drivers/staging/gpib/eastwood/fluke_gpib.c
@@ -94,12 +94,12 @@ static int fluke_go_to_standby(struct gpib_board *board)
        return nec7210_go_to_standby(board, &priv->nec7210_priv);
 }
 
-static void fluke_request_system_control(struct gpib_board *board, int request_control)
+static int fluke_request_system_control(struct gpib_board *board, int request_control)
 {
        struct fluke_priv *priv = board->private_data;
        struct nec7210_priv *nec_priv = &priv->nec7210_priv;
 
-       nec7210_request_system_control(board, nec_priv, request_control);
+       return nec7210_request_system_control(board, nec_priv, request_control);
 }
 
 static void fluke_interface_clear(struct gpib_board *board, int assert)

diff --git a/drivers/staging/gpib/fmh_gpib/fmh_gpib.c b/drivers/staging/gpib/fmh_gpib/fmh_gpib.c
index ca07e6ecb0a8d04595d5dca6a34f7d872d44e0ba..4138f3d2bae7f44bd6bc83ae89205c0457011980 100644 (file)
--- a/drivers/staging/gpib/fmh_gpib/fmh_gpib.c
+++ b/drivers/staging/gpib/fmh_gpib/fmh_gpib.c
@@ -86,12 +86,12 @@ static int fmh_gpib_go_to_standby(struct gpib_board *board)
        return nec7210_go_to_standby(board, &priv->nec7210_priv);
 }
 
-static void fmh_gpib_request_system_control(struct gpib_board *board, int request_control)
+static int fmh_gpib_request_system_control(struct gpib_board *board, int request_control)
 {
        struct fmh_priv *priv = board->private_data;
        struct nec7210_priv *nec_priv = &priv->nec7210_priv;
 
-       nec7210_request_system_control(board, nec_priv, request_control);
+       return nec7210_request_system_control(board, nec_priv, request_control);
 }
 
 static void fmh_gpib_interface_clear(struct gpib_board *board, int assert)

diff --git a/drivers/staging/gpib/gpio/gpib_bitbang.c b/drivers/staging/gpib/gpio/gpib_bitbang.c
index 0da7183891825105f3f10ad4e845f2882746fbcb..9670522fe36e58d593628ae3bf55302e487bfbdd 100644 (file)
--- a/drivers/staging/gpib/gpio/gpib_bitbang.c
+++ b/drivers/staging/gpib/gpio/gpib_bitbang.c
@@ -883,16 +883,16 @@ static int bb_go_to_standby(struct gpib_board *board)
        return 0;
 }
 
-static void bb_request_system_control(struct gpib_board *board, int request_control)
+static int bb_request_system_control(struct gpib_board *board, int request_control)
 {
        dbg_printk(2, "%d\n", request_control);
-       if (request_control) {
-               set_bit(CIC_NUM, &board->status);
-               // drive DAV & EOI false, enable NRFD & NDAC irqs
-               SET_DIR_WRITE(board->private_data);
-       } else {
-               clear_bit(CIC_NUM, &board->status);
-       }
+       if (!request_control)
+               return -EINVAL;
+
+       set_bit(CIC_NUM, &board->status);
+       // drive DAV & EOI false, enable NRFD & NDAC irqs
+       SET_DIR_WRITE(board->private_data);
+       return 0;
 }
 
 static void bb_interface_clear(struct gpib_board *board, int assert)

diff --git a/drivers/staging/gpib/hp_82335/hp82335.c b/drivers/staging/gpib/hp_82335/hp82335.c
index 3d08d2f726e1f170c9410b0ea9bbd921f21333fc..d0e47ef77c87ef34cda864c923370957ee23a0f9 100644 (file)
--- a/drivers/staging/gpib/hp_82335/hp82335.c
+++ b/drivers/staging/gpib/hp_82335/hp82335.c
@@ -68,11 +68,11 @@ static int hp82335_go_to_standby(struct gpib_board *board)
        return tms9914_go_to_standby(board, &priv->tms9914_priv);
 }
 
-static void hp82335_request_system_control(struct gpib_board *board, int request_control)
+static int hp82335_request_system_control(struct gpib_board *board, int request_control)
 {
        struct hp82335_priv *priv = board->private_data;
 
-       tms9914_request_system_control(board, &priv->tms9914_priv, request_control);
+       return tms9914_request_system_control(board, &priv->tms9914_priv, request_control);
 }
 
 static void hp82335_interface_clear(struct gpib_board *board, int assert)

diff --git a/drivers/staging/gpib/hp_82341/hp_82341.c b/drivers/staging/gpib/hp_82341/hp_82341.c
index 41accfdbc49a2f2033082b3e6b35a14a24bd6aaa..1b0822b2a3b8e015bbf4b8e5e18fa447502ba1e9 100644 (file)
--- a/drivers/staging/gpib/hp_82341/hp_82341.c
+++ b/drivers/staging/gpib/hp_82341/hp_82341.c
@@ -294,7 +294,7 @@ static int hp_82341_go_to_standby(struct gpib_board *board)
        return tms9914_go_to_standby(board, &priv->tms9914_priv);
 }
 
-static void hp_82341_request_system_control(struct gpib_board *board, int request_control)
+static int hp_82341_request_system_control(struct gpib_board *board, int request_control)
 {
        struct hp_82341_priv *priv = board->private_data;
 
@@ -303,7 +303,7 @@ static void hp_82341_request_system_control(struct gpib_board *board, int reques
        else
                priv->mode_control_bits &= ~SYSTEM_CONTROLLER_BIT;
        outb(priv->mode_control_bits, priv->iobase[0] + MODE_CONTROL_STATUS_REG);
-       tms9914_request_system_control(board, &priv->tms9914_priv, request_control);
+       return tms9914_request_system_control(board, &priv->tms9914_priv, request_control);
 }
 
 static void hp_82341_interface_clear(struct gpib_board *board, int assert)

diff --git a/drivers/staging/gpib/include/gpib_proto.h b/drivers/staging/gpib/include/gpib_proto.h
index 1c8e5955b9ce759529e1eebac68c66d2e70c7ea5..42e736e3b7cdefaaf499a007bd8b8eab7cf047af 100644 (file)
--- a/drivers/staging/gpib/include/gpib_proto.h
+++ b/drivers/staging/gpib/include/gpib_proto.h
@@ -31,7 +31,7 @@ int iblines(const struct gpib_board *board, short *lines);
 int ibrd(struct gpib_board *board, u8 *buf, size_t length, int *end_flag, size_t *bytes_read);
 int ibrpp(struct gpib_board *board, u8 *buf);
 int ibrsv2(struct gpib_board *board, u8 status_byte, int new_reason_for_service);
-void ibrsc(struct gpib_board *board, int request_control);
+int ibrsc(struct gpib_board *board, int request_control);
 int ibsic(struct gpib_board *board, unsigned int usec_duration);
 int ibsre(struct gpib_board *board, int enable);
 int ibpad(struct gpib_board *board, unsigned int addr);

diff --git a/drivers/staging/gpib/include/gpib_types.h b/drivers/staging/gpib/include/gpib_types.h
index 2af4574d400c11775f952399830cf6853a54e380..db040c80d778416e92ff6a607217db356d4bb0ee 100644 (file)
--- a/drivers/staging/gpib/include/gpib_types.h
+++ b/drivers/staging/gpib/include/gpib_types.h
@@ -100,7 +100,7 @@ struct gpib_interface {
         */
        int (*go_to_standby)(struct gpib_board *board);
        /* request/release control of the IFC and REN lines (system controller) */
-       void (*request_system_control)(struct gpib_board *board, int request_control);
+       int (*request_system_control)(struct gpib_board *board, int request_control);
        /*
         * Asserts or de-asserts 'interface clear' (IFC) depending on
         * boolean value of 'assert'

diff --git a/drivers/staging/gpib/include/nec7210.h b/drivers/staging/gpib/include/nec7210.h
index 97a56f74258ba0f65b1927dec73c2f2b3c57e395..312217b4580ea7b896622b83c7b21499b823286f 100644 (file)
--- a/drivers/staging/gpib/include/nec7210.h
+++ b/drivers/staging/gpib/include/nec7210.h
@@ -86,8 +86,8 @@ int nec7210_command(struct gpib_board *board, struct nec7210_priv *priv, u8 *buf
                    size_t length, size_t *bytes_written);
 int nec7210_take_control(struct gpib_board *board, struct nec7210_priv *priv, int syncronous);
 int nec7210_go_to_standby(struct gpib_board *board, struct nec7210_priv *priv);
-void nec7210_request_system_control(struct gpib_board *board,
-                                   struct nec7210_priv *priv, int request_control);
+int nec7210_request_system_control(struct gpib_board *board,
+                                  struct nec7210_priv *priv, int request_control);
 void nec7210_interface_clear(struct gpib_board *board, struct nec7210_priv *priv, int assert);
 void nec7210_remote_enable(struct gpib_board *board, struct nec7210_priv *priv, int enable);
 int nec7210_enable_eos(struct gpib_board *board, struct nec7210_priv *priv, u8 eos_bytes,

diff --git a/drivers/staging/gpib/include/tms9914.h b/drivers/staging/gpib/include/tms9914.h
index 352fc516fd4065a801adc83326027e82af0de6e2..50a9d3b226190267c6661ff99af8e9114789bb61 100644 (file)
--- a/drivers/staging/gpib/include/tms9914.h
+++ b/drivers/staging/gpib/include/tms9914.h
@@ -93,8 +93,8 @@ int tms9914_take_control(struct gpib_board *board, struct tms9914_priv *priv, in
 int tms9914_take_control_workaround(struct gpib_board *board, struct tms9914_priv *priv,
                                    int syncronous);
 int tms9914_go_to_standby(struct gpib_board *board, struct tms9914_priv *priv);
-void tms9914_request_system_control(struct gpib_board *board, struct tms9914_priv *priv,
-                                   int request_control);
+int tms9914_request_system_control(struct gpib_board *board, struct tms9914_priv *priv,
+                                  int request_control);
 void tms9914_interface_clear(struct gpib_board *board, struct tms9914_priv *priv, int assert);
 void tms9914_remote_enable(struct gpib_board *board, struct tms9914_priv *priv, int enable);
 int tms9914_enable_eos(struct gpib_board *board, struct tms9914_priv *priv, u8 eos_bytes,

diff --git a/drivers/staging/gpib/ines/ines.h b/drivers/staging/gpib/ines/ines.h
index 396cf0bd9ad1b09fea1696925010d1afb09a487f..07b82f790c4b7c7bd6ba62b3885a36c38bbed3cd 100644 (file)
--- a/drivers/staging/gpib/ines/ines.h
+++ b/drivers/staging/gpib/ines/ines.h
@@ -47,7 +47,7 @@ int ines_accel_write(struct gpib_board *board, u8 *buffer, size_t length,
 int ines_command(struct gpib_board *board, u8 *buffer, size_t length, size_t *bytes_written);
 int ines_take_control(struct gpib_board *board, int synchronous);
 int ines_go_to_standby(struct gpib_board *board);
-void ines_request_system_control(struct gpib_board *board, int request_control);
+int ines_request_system_control(struct gpib_board *board, int request_control);
 void ines_interface_clear(struct gpib_board *board, int assert);
 void ines_remote_enable(struct gpib_board *board, int enable);
 int ines_enable_eos(struct gpib_board *board, u8 eos_byte, int compare_8_bits);

diff --git a/drivers/staging/gpib/ines/ines_gpib.c b/drivers/staging/gpib/ines/ines_gpib.c
index bf830defcad34b07e117b9d2b3e9a2b1c1e31be4..49947ac30feb60b8a1034e4480db45f7df1d254a 100644 (file)
--- a/drivers/staging/gpib/ines/ines_gpib.c
+++ b/drivers/staging/gpib/ines/ines_gpib.c
@@ -441,11 +441,11 @@ int ines_go_to_standby(struct gpib_board *board)
        return nec7210_go_to_standby(board, &priv->nec7210_priv);
 }
 
-void ines_request_system_control(struct gpib_board *board, int request_control)
+int ines_request_system_control(struct gpib_board *board, int request_control)
 {
        struct ines_priv *priv = board->private_data;
 
-       nec7210_request_system_control(board, &priv->nec7210_priv, request_control);
+       return nec7210_request_system_control(board, &priv->nec7210_priv, request_control);
 }
 
 void ines_interface_clear(struct gpib_board *board, int assert)

diff --git a/drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c b/drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c
index 19127ee906c2c94e26048022c3a2facf9e6b0dcb..2e315c7756c4a94b1ec6b661ee04febd888ca2aa 100644 (file)
--- a/drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c
+++ b/drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c
@@ -911,15 +911,14 @@ static void usb_gpib_remote_enable(struct gpib_board *board, int enable)
 
 /* request_system_control */
 
-static void usb_gpib_request_system_control(struct gpib_board *board,
-                                           int request_control)
+static int usb_gpib_request_system_control(struct gpib_board *board, int request_control)
 {
-       if (request_control)
-               set_bit(CIC_NUM, &board->status);
-       else
-               clear_bit(CIC_NUM, &board->status);
+       if (!request_control)
+               return -EINVAL;
 
+       set_bit(CIC_NUM, &board->status);
        DIA_LOG(1, "done with %d -> %lx\n", request_control, board->status);
+       return 0;
 }
 
 /* take_control */

diff --git a/drivers/staging/gpib/nec7210/nec7210.c b/drivers/staging/gpib/nec7210/nec7210.c
index e68361d213ee4f97d002609180a2914bb8c4e33c..34a1cae4f4864e6e1ae2c74683d0d12ebd4d742e 100644 (file)
--- a/drivers/staging/gpib/nec7210/nec7210.c
+++ b/drivers/staging/gpib/nec7210/nec7210.c
@@ -332,14 +332,15 @@ int nec7210_go_to_standby(struct gpib_board *board, struct nec7210_priv *priv)
 }
 EXPORT_SYMBOL(nec7210_go_to_standby);
 
-void nec7210_request_system_control(struct gpib_board *board, struct nec7210_priv *priv,
-                                   int request_control)
+int nec7210_request_system_control(struct gpib_board *board, struct nec7210_priv *priv,
+                                  int request_control)
 {
        if (request_control == 0) {
                write_byte(priv, AUX_CREN, AUXMR);
                write_byte(priv, AUX_CIFC, AUXMR);
                write_byte(priv, AUX_DSC, AUXMR);
        }
+       return 0;
 }
 EXPORT_SYMBOL(nec7210_request_system_control);
 

diff --git a/drivers/staging/gpib/ni_usb/ni_usb_gpib.c b/drivers/staging/gpib/ni_usb/ni_usb_gpib.c
index d5b281fa8b372402cb09390e9ea24a32ab56aa5c..9ec850c4749fc834925263b49b819d4705ac47fb 100644 (file)
--- a/drivers/staging/gpib/ni_usb/ni_usb_gpib.c
+++ b/drivers/staging/gpib/ni_usb/ni_usb_gpib.c
@@ -1055,7 +1055,7 @@ static int ni_usb_go_to_standby(struct gpib_board *board)
        return 0;
 }
 
-static void ni_usb_request_system_control(struct gpib_board *board, int request_control)
+static int ni_usb_request_system_control(struct gpib_board *board, int request_control)
 {
        int retval;
        struct ni_usb_priv *ni_priv = board->private_data;
@@ -1065,7 +1065,7 @@ static void ni_usb_request_system_control(struct gpib_board *board, int request_
        unsigned int ibsta;
 
        if (!ni_priv->bus_interface)
-               return; // -ENODEV;
+               return -ENODEV;
        usb_dev = interface_to_usbdev(ni_priv->bus_interface);
        if (request_control) {
                writes[i].device = NIUSB_SUBDEV_TNT4882;
@@ -1097,12 +1097,12 @@ static void ni_usb_request_system_control(struct gpib_board *board, int request_
        retval = ni_usb_write_registers(ni_priv, writes, i, &ibsta);
        if (retval < 0) {
                dev_err(&usb_dev->dev, "register write failed, retval=%i\n", retval);
-               return; // retval;
+               return retval;
        }
        if (!request_control)
                ni_priv->ren_state = 0;
        ni_usb_soft_update_status(board, ibsta, 0);
-       return; // 0;
+       return 0;
 }
 
 //FIXME maybe the interface should have a "pulse interface clear" function that can return an error?

diff --git a/drivers/staging/gpib/pc2/pc2_gpib.c b/drivers/staging/gpib/pc2/pc2_gpib.c
index fd191d24d7a60cdec40d14322f911cfb93112aa7..2282492025b78db6a966cbee5a4fb078f605bcfe 100644 (file)
--- a/drivers/staging/gpib/pc2/pc2_gpib.c
+++ b/drivers/staging/gpib/pc2/pc2_gpib.c
@@ -128,11 +128,11 @@ static int pc2_go_to_standby(struct gpib_board *board)
        return nec7210_go_to_standby(board, &priv->nec7210_priv);
 }
 
-static void pc2_request_system_control(struct gpib_board *board, int request_control)
+static int pc2_request_system_control(struct gpib_board *board, int request_control)
 {
        struct pc2_priv *priv = board->private_data;
 
-       nec7210_request_system_control(board, &priv->nec7210_priv, request_control);
+       return nec7210_request_system_control(board, &priv->nec7210_priv, request_control);
 }
 
 static void pc2_interface_clear(struct gpib_board *board, int assert)

diff --git a/drivers/staging/gpib/tms9914/tms9914.c b/drivers/staging/gpib/tms9914/tms9914.c
index 9208c50d9c75169359212d24c9753ac2395429c6..04d57108efc740b3084c4b8bbbecdb719e4934f1 100644 (file)
--- a/drivers/staging/gpib/tms9914/tms9914.c
+++ b/drivers/staging/gpib/tms9914/tms9914.c
@@ -118,8 +118,8 @@ void tms9914_remote_enable(struct gpib_board *board, struct tms9914_priv *priv,
 }
 EXPORT_SYMBOL_GPL(tms9914_remote_enable);
 
-void tms9914_request_system_control(struct gpib_board *board, struct tms9914_priv *priv,
-                                   int request_control)
+int tms9914_request_system_control(struct gpib_board *board, struct tms9914_priv *priv,
+                                  int request_control)
 {
        if (request_control) {
                write_byte(priv, AUX_RQC, AUXCR);
@@ -127,6 +127,7 @@ void tms9914_request_system_control(struct gpib_board *board, struct tms9914_pri
                clear_bit(CIC_NUM, &board->status);
                write_byte(priv, AUX_RLC, AUXCR);
        }
+       return 0;
 }
 EXPORT_SYMBOL_GPL(tms9914_request_system_control);
 

diff --git a/drivers/staging/gpib/tnt4882/tnt4882_gpib.c b/drivers/staging/gpib/tnt4882/tnt4882_gpib.c
index 9f7f8b311da321bc19757cc05739c4d32d80fca4..a17b69e349867942fbcad27823bed87e10ce6a4b 100644 (file)
--- a/drivers/staging/gpib/tnt4882/tnt4882_gpib.c
+++ b/drivers/staging/gpib/tnt4882/tnt4882_gpib.c
@@ -645,19 +645,21 @@ static int tnt4882_go_to_standby(struct gpib_board *board)
        return nec7210_go_to_standby(board, &priv->nec7210_priv);
 }
 
-static void tnt4882_request_system_control(struct gpib_board *board, int request_control)
+static int tnt4882_request_system_control(struct gpib_board *board, int request_control)
 {
        struct tnt4882_priv *priv = board->private_data;
+       int retval;
 
        if (request_control) {
                tnt_writeb(priv, SETSC, CMDR);
                udelay(1);
        }
-       nec7210_request_system_control(board, &priv->nec7210_priv, request_control);
+       retval = nec7210_request_system_control(board, &priv->nec7210_priv, request_control);
        if (!request_control) {
                tnt_writeb(priv, CLRSC, CMDR);
                udelay(1);
        }
+       return retval;
 }
 
 static void tnt4882_interface_clear(struct gpib_board *board, int assert)