* [PATCH v2 00/11] staging: gpib: Patch set for gpib staging drivers
@ 2024-11-03 21:26 Dave Penkler
2024-11-03 21:26 ` [PATCH 01/11] staging: gpib: Fix buffer overflow in ni_usb_init Dave Penkler
` (10 more replies)
0 siblings, 11 replies; 16+ messages in thread
From: Dave Penkler @ 2024-11-03 21:26 UTC (permalink / raw)
To: gregkh, linux-staging, linux-kernel
Cc: skhan, arnd, dan.carpenter, Dave Penkler
Patch 1 is a bug fix
Patches 2-6 replace custom debug with dev_dbg as well as
using dev_xxx for pr_xxx where feasible.
Patch 7 Corrects some errors in Kconfig
Patch 8-10 are a code cleanup
Patch 11 corrects some GPIB behaviour
Changes in v2
Add staging: gpib: prefix to subject lines
-Patch 1 Use kmalloc_array, remove blanks in commit message and add Fixes tag
-Patch 3 Delete commented out code
-Patch 7 Fix Fixes tag
-Patch 8 Split into 3 patches 8,9 & 10
-Patch 9 -> 11 Clarify commit message, delete blank line and add defines
for max primary and secondary addresses.
Dave Penkler (11):
staging: gpib: Fix buffer overflow in ni_usb_init
staging: gpib: Replace custom debug with dev_dbg
staging: gpib: Update messaging and usb_device refs in ni_usb
staging: gpib: Update messaging and usb_device refs in agilent_usb
staging: gpib: Remove GPIB_DEBUG reference and update messaging
staging: gpib: Use dev_xxx for messaging
staging: gpib: Fix Kconfig
staging: gpib: Remove unneeded lookup table
staging: gpib: Remove GPIO14 and GPIO15 lines in lookup tables
staging: gpib: Re-order the lookup tables
staging: gpib: Correct check for max secondary address
drivers/staging/gpib/Kconfig | 14 +-
drivers/staging/gpib/Makefile | 1 -
.../gpib/agilent_82350b/agilent_82350b.c | 70 ++--
.../gpib/agilent_82357a/agilent_82357a.c | 266 +++++++-----
drivers/staging/gpib/cb7210/cb7210.c | 2 +-
drivers/staging/gpib/common/gpib_os.c | 142 +++----
drivers/staging/gpib/common/iblib.c | 22 +-
drivers/staging/gpib/common/ibsys.h | 7 +-
drivers/staging/gpib/eastwood/fluke_gpib.c | 2 +-
drivers/staging/gpib/fmh_gpib/fmh_gpib.c | 4 +-
drivers/staging/gpib/gpio/gpib_bitbang.c | 41 +-
drivers/staging/gpib/include/gpibP.h | 8 +-
drivers/staging/gpib/ines/ines_gpib.c | 2 +-
.../gpib/lpvo_usb_gpib/lpvo_usb_gpib.c | 69 ++--
drivers/staging/gpib/nec7210/nec7210.c | 34 +-
drivers/staging/gpib/ni_usb/ni_usb_gpib.c | 378 ++++++++++--------
drivers/staging/gpib/tms9914/tms9914.c | 8 +-
drivers/staging/gpib/tnt4882/tnt4882_gpib.c | 7 +-
18 files changed, 561 insertions(+), 516 deletions(-)
--
2.46.2
^ permalink raw reply [flat|nested] 16+ messages in thread
* [PATCH 01/11] staging: gpib: Fix buffer overflow in ni_usb_init
2024-11-03 21:26 [PATCH v2 00/11] staging: gpib: Patch set for gpib staging drivers Dave Penkler
@ 2024-11-03 21:26 ` Dave Penkler
2024-11-03 21:26 ` [PATCH 02/11] staging: gpib: Replace custom debug with dev_dbg Dave Penkler
` (9 subsequent siblings)
10 siblings, 0 replies; 16+ messages in thread
From: Dave Penkler @ 2024-11-03 21:26 UTC (permalink / raw)
To: gregkh, linux-staging, linux-kernel
Cc: skhan, arnd, dan.carpenter, Dave Penkler
The writes buffer size was not taking into account the number of
entries in the array which was causing random oopses.
Fixes: 4e127de14fa7 ("staging: gpib: Add National Instruments USB GPIB driver")
Signed-off-by: Dave Penkler <dpenkler@gmail.com>
---
drivers/staging/gpib/ni_usb/ni_usb_gpib.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/gpib/ni_usb/ni_usb_gpib.c b/drivers/staging/gpib/ni_usb/ni_usb_gpib.c
index 571f07800c9a..b7550a937f15 100644
--- a/drivers/staging/gpib/ni_usb/ni_usb_gpib.c
+++ b/drivers/staging/gpib/ni_usb/ni_usb_gpib.c
@@ -1726,7 +1726,7 @@ static int ni_usb_init(gpib_board_t *board)
unsigned int ibsta;
int writes_len;
- writes = kmalloc(sizeof(*writes), GFP_KERNEL);
+ writes = kmalloc_array(NUM_INIT_WRITES, sizeof(*writes), GFP_KERNEL);
if (!writes)
return -ENOMEM;
--
2.46.2
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 02/11] staging: gpib: Replace custom debug with dev_dbg
2024-11-03 21:26 [PATCH v2 00/11] staging: gpib: Patch set for gpib staging drivers Dave Penkler
2024-11-03 21:26 ` [PATCH 01/11] staging: gpib: Fix buffer overflow in ni_usb_init Dave Penkler
@ 2024-11-03 21:26 ` Dave Penkler
2024-11-03 21:26 ` [PATCH 03/11] staging: gpib: Update messaging and usb_device refs in ni_usb Dave Penkler
` (8 subsequent siblings)
10 siblings, 0 replies; 16+ messages in thread
From: Dave Penkler @ 2024-11-03 21:26 UTC (permalink / raw)
To: gregkh, linux-staging, linux-kernel
Cc: skhan, arnd, dan.carpenter, Dave Penkler
Remove GPIB_KERNEL_DEBUG config option
Replace GPIB_DPRINTK with dev_dbg
Signed-off-by: Dave Penkler <dpenkler@gmail.com>
---
drivers/staging/gpib/Kconfig | 10 --
drivers/staging/gpib/Makefile | 1 -
drivers/staging/gpib/cb7210/cb7210.c | 2 +-
drivers/staging/gpib/common/gpib_os.c | 138 +++++++++++---------
drivers/staging/gpib/common/iblib.c | 16 +--
drivers/staging/gpib/common/ibsys.h | 4 +-
drivers/staging/gpib/eastwood/fluke_gpib.c | 2 +-
drivers/staging/gpib/fmh_gpib/fmh_gpib.c | 4 +-
drivers/staging/gpib/include/gpibP.h | 8 +-
drivers/staging/gpib/ines/ines_gpib.c | 2 +-
drivers/staging/gpib/nec7210/nec7210.c | 34 ++---
drivers/staging/gpib/tms9914/tms9914.c | 8 +-
drivers/staging/gpib/tnt4882/tnt4882_gpib.c | 7 +-
13 files changed, 113 insertions(+), 123 deletions(-)
diff --git a/drivers/staging/gpib/Kconfig b/drivers/staging/gpib/Kconfig
index 999e7adacd82..0ea9a276c389 100644
--- a/drivers/staging/gpib/Kconfig
+++ b/drivers/staging/gpib/Kconfig
@@ -12,16 +12,6 @@ menuconfig GPIB
if GPIB
-config GPIB_KERNEL_DEBUG
- bool "GPIB debugging"
- depends on BROKEN
- help
- This is an option for use by developers; most people should
- say N here.
-
- It enables gpib core and driver debugging
- messages to be printed on the console.
-
config GPIB_COMMON
tristate "GPIB core"
help
diff --git a/drivers/staging/gpib/Makefile b/drivers/staging/gpib/Makefile
index a5bf32320b21..d0e88f5c0844 100644
--- a/drivers/staging/gpib/Makefile
+++ b/drivers/staging/gpib/Makefile
@@ -1,5 +1,4 @@
-subdir-ccflags-$(CONFIG_GPIB_KERNEL_DEBUG) := -DGPIB_DEBUG
subdir-ccflags-y += -I$(src)/include -I$(src)/uapi
obj-$(CONFIG_GPIB_AGILENT_82350B) += agilent_82350b/
diff --git a/drivers/staging/gpib/cb7210/cb7210.c b/drivers/staging/gpib/cb7210/cb7210.c
index c827d03dacf5..63df7f3eb3f3 100644
--- a/drivers/staging/gpib/cb7210/cb7210.c
+++ b/drivers/staging/gpib/cb7210/cb7210.c
@@ -479,7 +479,7 @@ irqreturn_t cb7210_internal_interrupt(gpib_board_t *board)
status2 = read_byte(nec_priv, ISR2);
nec7210_interrupt_have_status(board, nec_priv, status1, status2);
- GPIB_DPRINTK("cb7210: status 0x%x, mode 0x%x\n", hs_status, priv->hs_mode_bits);
+ dev_dbg(board->gpib_dev, "cb7210: status 0x%x, mode 0x%x\n", hs_status, priv->hs_mode_bits);
clear_bits = 0;
diff --git a/drivers/staging/gpib/common/gpib_os.c b/drivers/staging/gpib/common/gpib_os.c
index 6b12404efe7d..e84097ac8f69 100644
--- a/drivers/staging/gpib/common/gpib_os.c
+++ b/drivers/staging/gpib/common/gpib_os.c
@@ -69,7 +69,7 @@ static int t1_delay_ioctl(gpib_board_t *board, unsigned long arg);
static int cleanup_open_devices(gpib_file_private_t *file_priv, gpib_board_t *board);
-static int pop_gpib_event_nolock(gpib_event_queue_t *queue, short *event_type);
+static int pop_gpib_event_nolock(gpib_board_t *board, gpib_event_queue_t *queue, short *event_type);
/*
* Timer functions
@@ -225,7 +225,7 @@ unsigned int num_status_bytes(const gpib_status_queue_t *dev)
}
// push status byte onto back of status byte fifo
-int push_status_byte(gpib_status_queue_t *device, u8 poll_byte)
+int push_status_byte(gpib_board_t *board, gpib_status_queue_t *device, u8 poll_byte)
{
struct list_head *head = &device->status_bytes;
status_byte_t *status;
@@ -236,7 +236,7 @@ int push_status_byte(gpib_status_queue_t *device, u8 poll_byte)
u8 lost_byte;
device->dropped_byte = 1;
- retval = pop_status_byte(device, &lost_byte);
+ retval = pop_status_byte(board, device, &lost_byte);
if (retval < 0)
return retval;
}
@@ -252,14 +252,14 @@ int push_status_byte(gpib_status_queue_t *device, u8 poll_byte)
device->num_status_bytes++;
- GPIB_DPRINTK("pushed status byte 0x%x, %i in queue\n",
- (int)poll_byte, num_status_bytes(device));
+ dev_dbg(board->gpib_dev, "pushed status byte 0x%x, %i in queue\n",
+ (int)poll_byte, num_status_bytes(device));
return 0;
}
// pop status byte from front of status byte fifo
-int pop_status_byte(gpib_status_queue_t *device, u8 *poll_byte)
+int pop_status_byte(gpib_board_t *board, gpib_status_queue_t *device, u8 *poll_byte)
{
struct list_head *head = &device->status_bytes;
struct list_head *front = head->next;
@@ -284,8 +284,8 @@ int pop_status_byte(gpib_status_queue_t *device, u8 *poll_byte)
device->num_status_bytes--;
- GPIB_DPRINTK("popped status byte 0x%x, %i in queue\n",
- (int)*poll_byte, num_status_bytes(device));
+ dev_dbg(board->gpib_dev, "popped status byte 0x%x, %i in queue\n",
+ (int)*poll_byte, num_status_bytes(device));
return 0;
}
@@ -310,11 +310,11 @@ int get_serial_poll_byte(gpib_board_t *board, unsigned int pad, int sad, unsigne
{
gpib_status_queue_t *device;
- GPIB_DPRINTK("%s:()\n", __func__);
+ dev_dbg(board->gpib_dev, "%s:()\n", __func__);
device = get_gpib_status_queue(board, pad, sad);
if (num_status_bytes(device))
- return pop_status_byte(device, poll_byte);
+ return pop_status_byte(board, device, poll_byte);
else
return dvrsp(board, pad, sad, usec_timeout, poll_byte);
}
@@ -323,7 +323,7 @@ int autopoll_all_devices(gpib_board_t *board)
{
int retval;
- GPIB_DPRINTK("entering %s()\n", __func__);
+ dev_dbg(board->gpib_dev, "entering %s()\n", __func__);
if (mutex_lock_interruptible(&board->user_mutex))
return -ERESTARTSYS;
if (mutex_lock_interruptible(&board->big_gpib_mutex)) {
@@ -331,7 +331,7 @@ int autopoll_all_devices(gpib_board_t *board)
return -ERESTARTSYS;
}
- GPIB_DPRINTK("autopoll has board lock\n");
+ dev_dbg(board->gpib_dev, "autopoll has board lock\n");
retval = serial_poll_all(board, serial_timeout);
if (retval < 0) {
@@ -340,7 +340,7 @@ int autopoll_all_devices(gpib_board_t *board)
return retval;
}
- GPIB_DPRINTK("%s complete\n", __func__);
+ dev_dbg(board->gpib_dev, "%s complete\n", __func__);
/* need to wake wait queue in case someone is
* waiting on RQS
*/
@@ -358,7 +358,7 @@ static int setup_serial_poll(gpib_board_t *board, unsigned int usec_timeout)
size_t bytes_written;
int ret;
- GPIB_DPRINTK("entering %s()\n", __func__);
+ dev_dbg(board->gpib_dev, "entering %s()\n", __func__);
os_start_timer(board, usec_timeout);
ret = ibcac(board, 1, 1);
@@ -394,7 +394,7 @@ static int read_serial_poll_byte(gpib_board_t *board, unsigned int pad,
int i;
size_t nbytes;
- GPIB_DPRINTK("entering %s(), pad=%i sad=%i\n", __func__, pad, sad);
+ dev_dbg(board->gpib_dev, "entering %s(), pad=%i sad=%i\n", __func__, pad, sad);
os_start_timer(board, usec_timeout);
ret = ibcac(board, 1, 1);
@@ -436,7 +436,7 @@ static int cleanup_serial_poll(gpib_board_t *board, unsigned int usec_timeout)
int ret;
size_t bytes_written;
- GPIB_DPRINTK("entering %s()\n", __func__);
+ dev_dbg(board->gpib_dev, "entering %s()\n", __func__);
os_start_timer(board, usec_timeout);
ret = ibcac(board, 1, 1);
@@ -485,7 +485,7 @@ int serial_poll_all(gpib_board_t *board, unsigned int usec_timeout)
u8 result;
unsigned int num_bytes = 0;
- GPIB_DPRINTK("entering %s()\n", __func__);
+ dev_dbg(board->gpib_dev, "entering %s()\n", __func__);
head = &board->device_list;
if (head->next == head)
@@ -502,7 +502,7 @@ int serial_poll_all(gpib_board_t *board, unsigned int usec_timeout)
if (retval < 0)
continue;
if (result & request_service_bit) {
- retval = push_status_byte(device, result);
+ retval = push_status_byte(board, device, result);
if (retval < 0)
continue;
num_bytes++;
@@ -596,15 +596,15 @@ int ibopen(struct inode *inode, struct file *filep)
priv = filep->private_data;
init_gpib_file_private((gpib_file_private_t *)filep->private_data);
- GPIB_DPRINTK("pid %i, gpib: opening minor %d\n", current->pid, minor);
+ dev_dbg(board->gpib_dev, "pid %i, gpib: opening minor %d\n", current->pid, minor);
if (board->use_count == 0) {
int retval;
retval = request_module("gpib%i", minor);
if (retval) {
- GPIB_DPRINTK("pid %i, gpib: request module returned %i\n",
- current->pid, retval);
+ dev_dbg(board->gpib_dev, "pid %i, gpib: request module returned %i\n",
+ current->pid, retval);
}
}
if (board->interface) {
@@ -630,16 +630,16 @@ int ibclose(struct inode *inode, struct file *filep)
return -ENODEV;
}
- GPIB_DPRINTK("pid %i, gpib: closing minor %d\n", current->pid, minor);
-
board = &board_array[minor];
+ dev_dbg(board->gpib_dev, "pid %i, closing minor %d\n", current->pid, minor);
+
if (priv) {
desc = handle_to_descriptor(priv, 0);
if (desc) {
if (desc->autopoll_enabled) {
- GPIB_DPRINTK("pid %i, gpib: decrementing autospollers\n",
- current->pid);
+ dev_dbg(board->gpib_dev, "pid %i, decrementing autospollers\n",
+ current->pid);
if (board->autospollers > 0)
board->autospollers--;
else
@@ -682,11 +682,11 @@ long ibioctl(struct file *filep, unsigned int cmd, unsigned long arg)
if (mutex_lock_interruptible(&board->big_gpib_mutex))
return -ERESTARTSYS;
- GPIB_DPRINTK("pid %i, minor %i, ioctl %d, interface=%s, use=%d, onl=%d\n",
- current->pid, minor, cmd & 0xff,
- board->interface ? board->interface->name : "",
- board->use_count,
- board->online);
+ dev_dbg(board->gpib_dev, "pid %i, ioctl %d, interface=%s, use=%d, onl=%d\n",
+ current->pid, cmd & 0xff,
+ board->interface ? board->interface->name : "",
+ board->use_count,
+ board->online);
switch (cmd) {
case CFCBOARDTYPE:
@@ -870,7 +870,7 @@ long ibioctl(struct file *filep, unsigned int cmd, unsigned long arg)
done:
mutex_unlock(&board->big_gpib_mutex);
- GPIB_DPRINTK("ioctl done status = 0x%lx\n", board->status);
+ dev_dbg(board->gpib_dev, "ioctl done status = 0x%lx\n", board->status);
return retval;
}
@@ -1180,7 +1180,8 @@ static int status_bytes_ioctl(gpib_board_t *board, unsigned long arg)
return 0;
}
-static int increment_open_device_count(struct list_head *head, unsigned int pad, int sad)
+static int increment_open_device_count(gpib_board_t *board, struct list_head *head,
+ unsigned int pad, int sad)
{
struct list_head *list_ptr;
gpib_status_queue_t *device;
@@ -1191,8 +1192,8 @@ static int increment_open_device_count(struct list_head *head, unsigned int pad,
for (list_ptr = head->next; list_ptr != head; list_ptr = list_ptr->next) {
device = list_entry(list_ptr, gpib_status_queue_t, list);
if (gpib_address_equal(device->pad, device->sad, pad, sad)) {
- GPIB_DPRINTK("pid %i, incrementing open count for pad %i, sad %i\n",
- current->pid, device->pad, device->sad);
+ dev_dbg(board->gpib_dev, "pid %i, incrementing open count for pad %i, sad %i\n",
+ current->pid, device->pad, device->sad);
device->reference_count++;
return 0;
}
@@ -1209,14 +1210,14 @@ static int increment_open_device_count(struct list_head *head, unsigned int pad,
list_add(&device->list, head);
- GPIB_DPRINTK("pid %i, opened pad %i, sad %i\n",
- current->pid, device->pad, device->sad);
+ dev_dbg(board->gpib_dev, "pid %i, opened pad %i, sad %i\n",
+ current->pid, device->pad, device->sad);
return 0;
}
-static int subtract_open_device_count(struct list_head *head, unsigned int pad, int sad,
- unsigned int count)
+static int subtract_open_device_count(gpib_board_t *board, struct list_head *head,
+ unsigned int pad, int sad, unsigned int count)
{
gpib_status_queue_t *device;
struct list_head *list_ptr;
@@ -1224,16 +1225,16 @@ static int subtract_open_device_count(struct list_head *head, unsigned int pad,
for (list_ptr = head->next; list_ptr != head; list_ptr = list_ptr->next) {
device = list_entry(list_ptr, gpib_status_queue_t, list);
if (gpib_address_equal(device->pad, device->sad, pad, sad)) {
- GPIB_DPRINTK("pid %i, decrementing open count for pad %i, sad %i\n",
- current->pid, device->pad, device->sad);
+ dev_dbg(board->gpib_dev, "pid %i, decrementing open count for pad %i, sad %i\n",
+ current->pid, device->pad, device->sad);
if (count > device->reference_count) {
pr_err("gpib: bug! in %s()\n", __func__);
return -EINVAL;
}
device->reference_count -= count;
if (device->reference_count == 0) {
- GPIB_DPRINTK("pid %i, closing pad %i, sad %i\n",
- current->pid, device->pad, device->sad);
+ dev_dbg(board->gpib_dev, "pid %i, closing pad %i, sad %i\n",
+ current->pid, device->pad, device->sad);
list_del(list_ptr);
kfree(device);
}
@@ -1244,9 +1245,10 @@ static int subtract_open_device_count(struct list_head *head, unsigned int pad,
return -EINVAL;
}
-static inline int decrement_open_device_count(struct list_head *head, unsigned int pad, int sad)
+static inline int decrement_open_device_count(gpib_board_t *board, struct list_head *head,
+ unsigned int pad, int sad)
{
- return subtract_open_device_count(head, pad, sad, 1);
+ return subtract_open_device_count(board, head, pad, sad, 1);
}
static int cleanup_open_devices(gpib_file_private_t *file_priv, gpib_board_t *board)
@@ -1262,7 +1264,7 @@ static int cleanup_open_devices(gpib_file_private_t *file_priv, gpib_board_t *bo
continue;
if (desc->is_board == 0) {
- retval = decrement_open_device_count(&board->device_list, desc->pad,
+ retval = decrement_open_device_count(board, &board->device_list, desc->pad,
desc->sad);
if (retval < 0)
return retval;
@@ -1306,7 +1308,7 @@ static int open_dev_ioctl(struct file *filep, gpib_board_t *board, unsigned long
file_priv->descriptors[i]->is_board = open_dev_cmd.is_board;
mutex_unlock(&file_priv->descriptors_mutex);
- retval = increment_open_device_count(&board->device_list, open_dev_cmd.pad,
+ retval = increment_open_device_count(board, &board->device_list, open_dev_cmd.pad,
open_dev_cmd.sad);
if (retval < 0)
return retval;
@@ -1339,7 +1341,7 @@ static int close_dev_ioctl(struct file *filep, gpib_board_t *board, unsigned lon
if (!file_priv->descriptors[cmd.handle])
return -EINVAL;
- retval = decrement_open_device_count(&board->device_list,
+ retval = decrement_open_device_count(board, &board->device_list,
file_priv->descriptors[cmd.handle]->pad,
file_priv->descriptors[cmd.handle]->sad);
if (retval < 0)
@@ -1356,7 +1358,7 @@ static int serial_poll_ioctl(gpib_board_t *board, unsigned long arg)
serial_poll_ioctl_t serial_cmd;
int retval;
- GPIB_DPRINTK("pid %i, entering %s()\n", __func__, current->pid);
+ dev_dbg(board->gpib_dev, "pid %i, entering %s()\n", current->pid, __func__);
retval = copy_from_user(&serial_cmd, (void *)arg, sizeof(serial_cmd));
if (retval)
@@ -1521,13 +1523,15 @@ static int pad_ioctl(gpib_board_t *board, gpib_file_private_t *file_priv,
if (retval < 0)
return retval;
} else {
- retval = decrement_open_device_count(&board->device_list, desc->pad, desc->sad);
+ retval = decrement_open_device_count(board, &board->device_list, desc->pad,
+ desc->sad);
if (retval < 0)
return retval;
desc->pad = cmd.pad;
- retval = increment_open_device_count(&board->device_list, desc->pad, desc->sad);
+ retval = increment_open_device_count(board, &board->device_list, desc->pad,
+ desc->sad);
if (retval < 0)
return retval;
}
@@ -1555,13 +1559,15 @@ static int sad_ioctl(gpib_board_t *board, gpib_file_private_t *file_priv,
if (retval < 0)
return retval;
} else {
- retval = decrement_open_device_count(&board->device_list, desc->pad, desc->sad);
+ retval = decrement_open_device_count(board, &board->device_list, desc->pad,
+ desc->sad);
if (retval < 0)
return retval;
desc->sad = cmd.sad;
- retval = increment_open_device_count(&board->device_list, desc->pad, desc->sad);
+ retval = increment_open_device_count(board, &board->device_list, desc->pad,
+ desc->sad);
if (retval < 0)
return retval;
}
@@ -1717,7 +1723,8 @@ static int mutex_ioctl(gpib_board_t *board, gpib_file_private_t *file_priv,
atomic_set(&file_priv->holding_mutex, 1);
- GPIB_DPRINTK("pid %i, locked board %d mutex\n", current->pid, board->minor);
+ dev_dbg(board->gpib_dev, "pid %i, locked board %d mutex\n",
+ current->pid, board->minor);
} else {
spin_lock(&board->locking_pid_spinlock);
if (current->pid != board->locking_pid) {
@@ -1732,7 +1739,8 @@ static int mutex_ioctl(gpib_board_t *board, gpib_file_private_t *file_priv,
atomic_set(&file_priv->holding_mutex, 0);
mutex_unlock(&board->user_mutex);
- GPIB_DPRINTK("pid %i, unlocked board %i mutex\n", current->pid, board->minor);
+ dev_dbg(board->gpib_dev, "pid %i, unlocked board %i mutex\n",
+ current->pid, board->minor);
}
return 0;
}
@@ -1747,7 +1755,7 @@ static int timeout_ioctl(gpib_board_t *board, unsigned long arg)
return -EFAULT;
board->usec_timeout = timeout;
- GPIB_DPRINTK("pid %i, timeout set to %i usec\n", current->pid, timeout);
+ dev_dbg(board->gpib_dev, "pid %i, timeout set to %i usec\n", current->pid, timeout);
return 0;
}
@@ -1922,7 +1930,7 @@ static int push_gpib_event_nolock(gpib_board_t *board, short event_type)
short lost_event;
queue->dropped_event = 1;
- retval = pop_gpib_event_nolock(queue, &lost_event);
+ retval = pop_gpib_event_nolock(board, queue, &lost_event);
if (retval < 0)
return retval;
}
@@ -1941,8 +1949,8 @@ static int push_gpib_event_nolock(gpib_board_t *board, short event_type)
queue->num_events++;
- GPIB_DPRINTK("pushed event %i, %i in queue\n",
- (int)event_type, num_gpib_events(queue));
+ dev_dbg(board->gpib_dev, "pushed event %i, %i in queue\n",
+ (int)event_type, num_gpib_events(queue));
return 0;
}
@@ -1966,7 +1974,7 @@ int push_gpib_event(gpib_board_t *board, short event_type)
}
EXPORT_SYMBOL(push_gpib_event);
-static int pop_gpib_event_nolock(gpib_event_queue_t *queue, short *event_type)
+static int pop_gpib_event_nolock(gpib_board_t *board, gpib_event_queue_t *queue, short *event_type)
{
struct list_head *head = &queue->event_head;
struct list_head *front = head->next;
@@ -1993,20 +2001,20 @@ static int pop_gpib_event_nolock(gpib_event_queue_t *queue, short *event_type)
queue->num_events--;
- GPIB_DPRINTK("popped event %i, %i in queue\n",
- (int)*event_type, num_gpib_events(queue));
+ dev_dbg(board->gpib_dev, "popped event %i, %i in queue\n",
+ (int)*event_type, num_gpib_events(queue));
return 0;
}
// pop event from front of event queue
-int pop_gpib_event(gpib_event_queue_t *queue, short *event_type)
+int pop_gpib_event(gpib_board_t *board, gpib_event_queue_t *queue, short *event_type)
{
unsigned long flags;
int retval;
spin_lock_irqsave(&queue->lock, flags);
- retval = pop_gpib_event_nolock(queue, event_type);
+ retval = pop_gpib_event_nolock(board, queue, event_type);
spin_unlock_irqrestore(&queue->lock, flags);
return retval;
}
@@ -2017,7 +2025,7 @@ static int event_ioctl(gpib_board_t *board, unsigned long arg)
int retval;
short event;
- retval = pop_gpib_event(&board->event_queue, &event);
+ retval = pop_gpib_event(board, &board->event_queue, &event);
if (retval < 0)
return retval;
@@ -2199,7 +2207,7 @@ void gpib_deallocate_board(gpib_board_t *board)
board->buffer_length = 0;
}
while (num_gpib_events(&board->event_queue))
- pop_gpib_event(&board->event_queue, &dummy);
+ pop_gpib_event(board, &board->event_queue, &dummy);
}
static void init_board_array(gpib_board_t *board_array, unsigned int length)
diff --git a/drivers/staging/gpib/common/iblib.c b/drivers/staging/gpib/common/iblib.c
index 83795e7f5cf1..fc57e760c144 100644
--- a/drivers/staging/gpib/common/iblib.c
+++ b/drivers/staging/gpib/common/iblib.c
@@ -178,13 +178,13 @@ static int autospoll_thread(void *board_void)
gpib_board_t *board = board_void;
int retval = 0;
- GPIB_DPRINTK("entering autospoll thread\n");
+ dev_dbg(board->gpib_dev, "entering autospoll thread\n");
while (1) {
wait_event_interruptible(board->wait,
kthread_should_stop() ||
autospoll_wait_should_wake_up(board));
- GPIB_DPRINTK("autospoll wait satisfied\n");
+ dev_dbg(board->gpib_dev, "autospoll wait satisfied\n");
if (kthread_should_stop())
break;
@@ -247,7 +247,7 @@ int ibonline(gpib_board_t *board)
}
#endif
board->online = 1;
- GPIB_DPRINTK("gpib: board online\n");
+ dev_dbg(board->gpib_dev, "gpib: board online\n");
return 0;
}
@@ -272,7 +272,7 @@ int iboffline(gpib_board_t *board)
board->interface->detach(board);
gpib_deallocate_board(board);
board->online = 0;
- GPIB_DPRINTK("gpib: board offline\n");
+ dev_dbg(board->gpib_dev, "gpib: board offline\n");
return 0;
}
@@ -436,7 +436,7 @@ int ibsic(gpib_board_t *board, unsigned int usec_duration)
pr_warn("gpib: warning, shortening long udelay\n");
}
- GPIB_DPRINTK("sending interface clear\n");
+ dev_dbg(board->gpib_dev, "sending interface clear\n");
board->interface->interface_clear(board, 1);
udelay(usec_duration);
board->interface->interface_clear(board, 0);
@@ -486,7 +486,7 @@ int ibpad(gpib_board_t *board, unsigned int addr)
board->pad = addr;
if (board->online)
board->interface->primary_address(board, board->pad);
- GPIB_DPRINTK("set primary addr to %i\n", board->pad);
+ dev_dbg(board->gpib_dev, "set primary addr to %i\n", board->pad);
return 0;
}
@@ -509,7 +509,7 @@ int ibsad(gpib_board_t *board, int addr)
else
board->interface->secondary_address(board, 0, 0);
}
- GPIB_DPRINTK("set secondary addr to %i\n", board->sad);
+ dev_dbg(board->gpib_dev, "set secondary addr to %i\n", board->sad);
return 0;
}
@@ -683,7 +683,7 @@ int ibwait(gpib_board_t *board, int wait_mask, int clear_mask, int set_mask,
if (wait_event_interruptible(board->wait, wait_satisfied(&winfo, status_queue,
wait_mask, status, desc))) {
- GPIB_DPRINTK("wait interrupted\n");
+ dev_dbg(board->gpib_dev, "wait interrupted\n");
retval = -ERESTARTSYS;
}
remove_wait_timer(&winfo);
diff --git a/drivers/staging/gpib/common/ibsys.h b/drivers/staging/gpib/common/ibsys.h
index 3f53a808a9b9..b78ca5ea4da1 100644
--- a/drivers/staging/gpib/common/ibsys.h
+++ b/drivers/staging/gpib/common/ibsys.h
@@ -20,8 +20,8 @@ int gpib_allocate_board(gpib_board_t *board);
void gpib_deallocate_board(gpib_board_t *board);
unsigned int num_status_bytes(const gpib_status_queue_t *dev);
-int push_status_byte(gpib_status_queue_t *device, uint8_t poll_byte);
-int pop_status_byte(gpib_status_queue_t *device, uint8_t *poll_byte);
+int push_status_byte(gpib_board_t *board, gpib_status_queue_t *device, uint8_t poll_byte);
+int pop_status_byte(gpib_board_t *board, gpib_status_queue_t *device, uint8_t *poll_byte);
gpib_status_queue_t *get_gpib_status_queue(gpib_board_t *board, unsigned int pad, int sad);
int get_serial_poll_byte(gpib_board_t *board, unsigned int pad, int sad,
unsigned int usec_timeout, uint8_t *poll_byte);
diff --git a/drivers/staging/gpib/eastwood/fluke_gpib.c b/drivers/staging/gpib/eastwood/fluke_gpib.c
index b528405f33e0..3f938ab0c84d 100644
--- a/drivers/staging/gpib/eastwood/fluke_gpib.c
+++ b/drivers/staging/gpib/eastwood/fluke_gpib.c
@@ -430,7 +430,7 @@ static int fluke_dma_write(gpib_board_t *board, uint8_t *buffer, size_t length,
test_bit(BUS_ERROR_BN, &nec_priv->state) ||
test_bit(DEV_CLEAR_BN, &nec_priv->state) ||
test_bit(TIMO_NUM, &board->status))) {
- GPIB_DPRINTK("gpib write interrupted!\n");
+ dev_dbg(board->gpib_dev, "gpib write interrupted!\n");
retval = -ERESTARTSYS;
}
if (test_bit(TIMO_NUM, &board->status))
diff --git a/drivers/staging/gpib/fmh_gpib/fmh_gpib.c b/drivers/staging/gpib/fmh_gpib/fmh_gpib.c
index 73409b066727..62791db1c34a 100644
--- a/drivers/staging/gpib/fmh_gpib/fmh_gpib.c
+++ b/drivers/staging/gpib/fmh_gpib/fmh_gpib.c
@@ -440,7 +440,7 @@ static int fmh_gpib_dma_write(gpib_board_t *board, uint8_t *buffer, size_t lengt
test_bit(BUS_ERROR_BN, &nec_priv->state) ||
test_bit(DEV_CLEAR_BN, &nec_priv->state) ||
test_bit(TIMO_NUM, &board->status))) {
- GPIB_DPRINTK("gpib write interrupted!\n");
+ dev_dbg(board->gpib_dev, "gpib write interrupted!\n");
retval = -ERESTARTSYS;
}
if (test_bit(TIMO_NUM, &board->status))
@@ -634,7 +634,7 @@ static int fmh_gpib_fifo_write_countable(gpib_board_t *board, uint8_t *buffer,
test_bit(BUS_ERROR_BN, &nec_priv->state) ||
test_bit(DEV_CLEAR_BN, &nec_priv->state) ||
test_bit(TIMO_NUM, &board->status))) {
- GPIB_DPRINTK("gpib write interrupted!\n");
+ dev_dbg(board->gpib_dev, "gpib write interrupted!\n");
retval = -ERESTARTSYS;
}
if (test_bit(TIMO_NUM, &board->status))
diff --git a/drivers/staging/gpib/include/gpibP.h b/drivers/staging/gpib/include/gpibP.h
index 0129fd29e704..5fc42b645ab7 100644
--- a/drivers/staging/gpib/include/gpibP.h
+++ b/drivers/staging/gpib/include/gpibP.h
@@ -26,7 +26,7 @@ struct pci_dev *gpib_pci_get_subsys(const gpib_board_config_t *config, unsigned
unsigned int ss_device, struct pci_dev *from);
unsigned int num_gpib_events(const gpib_event_queue_t *queue);
int push_gpib_event(gpib_board_t *board, short event_type);
-int pop_gpib_event(gpib_event_queue_t *queue, short *event_type);
+int pop_gpib_event(gpib_board_t *board, gpib_event_queue_t *queue, short *event_type);
int gpib_request_pseudo_irq(gpib_board_t *board, irqreturn_t (*handler)(int, void *));
void gpib_free_pseudo_irq(gpib_board_t *board);
int gpib_match_device_path(struct device *dev, const char *device_path_in);
@@ -35,12 +35,6 @@ extern gpib_board_t board_array[GPIB_MAX_NUM_BOARDS];
extern struct list_head registered_drivers;
-#ifdef GPIB_DEBUG
-#define GPIB_DPRINTK(format, args...) pr_info("gpib debug: " format, ## args)
-#else
-#define GPIB_DPRINTK(arg...)
-#endif
-
#include <linux/io.h>
void writeb_wrapper(unsigned int value, void *address);
diff --git a/drivers/staging/gpib/ines/ines_gpib.c b/drivers/staging/gpib/ines/ines_gpib.c
index e98a114a9570..9d8387c3bf01 100644
--- a/drivers/staging/gpib/ines/ines_gpib.c
+++ b/drivers/staging/gpib/ines/ines_gpib.c
@@ -202,7 +202,7 @@ static int ines_write_wait(gpib_board_t *board, struct ines_priv *ines_priv,
test_bit(BUS_ERROR_BN, &nec_priv->state) ||
test_bit(DEV_CLEAR_BN, &nec_priv->state) ||
test_bit(TIMO_NUM, &board->status))) {
- GPIB_DPRINTK("gpib write interrupted\n");
+ dev_dbg(board->gpib_dev, "gpib write interrupted\n");
return -ERESTARTSYS;
}
if (test_bit(BUS_ERROR_BN, &nec_priv->state))
diff --git a/drivers/staging/gpib/nec7210/nec7210.c b/drivers/staging/gpib/nec7210/nec7210.c
index 1330743d05fd..1d9951035497 100644
--- a/drivers/staging/gpib/nec7210/nec7210.c
+++ b/drivers/staging/gpib/nec7210/nec7210.c
@@ -53,7 +53,7 @@ int nec7210_parallel_poll(gpib_board_t *board, struct nec7210_priv *priv, uint8_
// wait for result FIXME: support timeouts
ret = wait_event_interruptible(board->wait, test_bit(COMMAND_READY_BN, &priv->state));
if (ret) {
- GPIB_DPRINTK("gpib: parallel poll interrupted\n");
+ dev_dbg(board->gpib_dev, "gpib: parallel poll interrupted\n");
return -ERESTARTSYS;
}
*result = read_byte(priv, CPTR);
@@ -198,7 +198,7 @@ unsigned int nec7210_update_status_nolock(gpib_board_t *board, struct nec7210_pr
priv->srq_pending = 0;
set_bit(SPOLL_NUM, &board->status);
}
-// GPIB_DPRINTK("status 0x%x, state 0x%x\n", board->status, priv->state);
+// dev_dbg(board->gpib_dev, "status 0x%x, state 0x%x\n", board->status, priv->state);
/* we rely on the interrupt handler to set the
* rest of the status bits
@@ -430,7 +430,7 @@ int nec7210_command(gpib_board_t *board, struct nec7210_priv *priv, uint8_t
test_bit(COMMAND_READY_BN, &priv->state) ||
test_bit(BUS_ERROR_BN, &priv->state) ||
test_bit(TIMO_NUM, &board->status))) {
- GPIB_DPRINTK("gpib command wait interrupted\n");
+ dev_dbg(board->gpib_dev, "gpib command wait interrupted\n");
retval = -ERESTARTSYS;
break;
}
@@ -455,11 +455,11 @@ int nec7210_command(gpib_board_t *board, struct nec7210_priv *priv, uint8_t
if (wait_event_interruptible(board->wait, test_bit(COMMAND_READY_BN, &priv->state) ||
test_bit(BUS_ERROR_BN, &priv->state) ||
test_bit(TIMO_NUM, &board->status))) {
- GPIB_DPRINTK("gpib command wait interrupted\n");
+ dev_dbg(board->gpib_dev, "gpib command wait interrupted\n");
retval = -ERESTARTSYS;
}
if (test_bit(TIMO_NUM, &board->status)) {
- GPIB_DPRINTK("gpib command timed out\n");
+ dev_dbg(board->gpib_dev, "gpib command timed out\n");
retval = -ETIMEDOUT;
}
if (test_and_clear_bit(BUS_ERROR_BN, &priv->state)) {
@@ -484,7 +484,7 @@ static int pio_read(gpib_board_t *board, struct nec7210_priv *priv, uint8_t *buf
test_bit(READ_READY_BN, &priv->state) ||
test_bit(DEV_CLEAR_BN, &priv->state) ||
test_bit(TIMO_NUM, &board->status))) {
- GPIB_DPRINTK("nec7210: pio read wait interrupted\n");
+ dev_dbg(board->gpib_dev, "nec7210: pio read wait interrupted\n");
retval = -ERESTARTSYS;
break;
}
@@ -503,12 +503,12 @@ static int pio_read(gpib_board_t *board, struct nec7210_priv *priv, uint8_t *buf
break;
}
if (test_bit(TIMO_NUM, &board->status)) {
- GPIB_DPRINTK("interrupted by timeout\n");
+ dev_dbg(board->gpib_dev, "interrupted by timeout\n");
retval = -ETIMEDOUT;
break;
}
if (test_bit(DEV_CLEAR_BN, &priv->state)) {
- GPIB_DPRINTK("interrupted by device clear\n");
+ dev_dbg(board->gpib_dev, "interrupted by device clear\n");
retval = -EINTR;
break;
}
@@ -558,7 +558,7 @@ static ssize_t __dma_read(gpib_board_t *board, struct nec7210_priv *priv, size_t
test_bit(DMA_READ_IN_PROGRESS_BN, &priv->state) == 0 ||
test_bit(DEV_CLEAR_BN, &priv->state) ||
test_bit(TIMO_NUM, &board->status))) {
- GPIB_DPRINTK("nec7210: dma read wait interrupted\n");
+ dev_dbg(board->gpib_dev, "nec7210: dma read wait interrupted\n");
retval = -ERESTARTSYS;
}
if (test_bit(TIMO_NUM, &board->status))
@@ -639,19 +639,19 @@ static int pio_write_wait(gpib_board_t *board, struct nec7210_priv *priv,
(wake_on_lacs && test_bit(LACS_NUM, &board->status)) ||
(wake_on_atn && test_bit(ATN_NUM, &board->status)) ||
test_bit(TIMO_NUM, &board->status))) {
- GPIB_DPRINTK("gpib write interrupted\n");
+ dev_dbg(board->gpib_dev, "gpib write interrupted\n");
return -ERESTARTSYS;
}
if (test_bit(TIMO_NUM, &board->status)) {
- GPIB_DPRINTK("nec7210: write timed out\n");
+ dev_dbg(board->gpib_dev, "nec7210: write timed out\n");
return -ETIMEDOUT;
}
if (test_bit(DEV_CLEAR_BN, &priv->state)) {
- GPIB_DPRINTK("nec7210: write interrupted by clear\n");
+ dev_dbg(board->gpib_dev, "nec7210: write interrupted by clear\n");
return -EINTR;
}
if (wake_on_bus_error && test_and_clear_bit(BUS_ERROR_BN, &priv->state)) {
- GPIB_DPRINTK("nec7210: bus error on write\n");
+ dev_dbg(board->gpib_dev, "nec7210: bus error on write\n");
return -EIO;
}
return 0;
@@ -677,7 +677,7 @@ static int pio_write(gpib_board_t *board, struct nec7210_priv *priv, uint8_t *bu
if (retval == -EIO) {
/* resend last byte on bus error */
*bytes_written = last_count;
- GPIB_DPRINTK("resending %c\n", buffer[*bytes_written]);
+ dev_dbg(board->gpib_dev, "resending %c\n", buffer[*bytes_written]);
/* we can get unrecoverable bus errors,
* so give up after a while
*/
@@ -734,7 +734,7 @@ static ssize_t __dma_write(gpib_board_t *board, struct nec7210_priv *priv, dma_a
test_bit(BUS_ERROR_BN, &priv->state) ||
test_bit(DEV_CLEAR_BN, &priv->state) ||
test_bit(TIMO_NUM, &board->status))) {
- GPIB_DPRINTK("gpib write interrupted!\n");
+ dev_dbg(board->gpib_dev, "gpib write interrupted!\n");
retval = -ERESTARTSYS;
}
if (test_bit(TIMO_NUM, &board->status))
@@ -969,8 +969,8 @@ irqreturn_t nec7210_interrupt_have_status(gpib_board_t *board,
(status2 & (priv->reg_bits[IMR2] & IMR2_ENABLE_INTR_MASK)) ||
nec7210_atn_has_changed(board, priv)) {
nec7210_update_status_nolock(board, priv);
- GPIB_DPRINTK("minor %i, stat %lx, isr1 0x%x, imr1 0x%x, isr2 0x%x, imr2 0x%x\n",
- board->minor, board->status, status1, priv->reg_bits[IMR1], status2,
+ dev_dbg(board->gpib_dev, "minor %i, stat %lx, isr1 0x%x, imr1 0x%x, isr2 0x%x, imr2 0x%x\n",
+ board->minor, board->status, status1, priv->reg_bits[IMR1], status2,
priv->reg_bits[IMR2]);
wake_up_interruptible(&board->wait); /* wake up sleeping process */
retval = IRQ_HANDLED;
diff --git a/drivers/staging/gpib/tms9914/tms9914.c b/drivers/staging/gpib/tms9914/tms9914.c
index 6452757f0a2a..152b243b845b 100644
--- a/drivers/staging/gpib/tms9914/tms9914.c
+++ b/drivers/staging/gpib/tms9914/tms9914.c
@@ -382,7 +382,7 @@ static unsigned int update_status_nolock(gpib_board_t *board, struct tms9914_pri
clear_bit(SRQI_NUM, &board->status);
}
- GPIB_DPRINTK("status 0x%lx, state 0x%lx\n", board->status, priv->state);
+ dev_dbg(board->gpib_dev, "status 0x%lx, state 0x%lx\n", board->status, priv->state);
return board->status;
}
@@ -549,7 +549,7 @@ static int pio_write_wait(gpib_board_t *board, struct tms9914_priv *priv)
test_bit(BUS_ERROR_BN, &priv->state) ||
test_bit(DEV_CLEAR_BN, &priv->state) ||
test_bit(TIMO_NUM, &board->status))) {
- GPIB_DPRINTK("gpib write interrupted!\n");
+ dev_dbg(board->gpib_dev, "gpib write interrupted!\n");
return -ERESTARTSYS;
}
if (test_bit(TIMO_NUM, &board->status))
@@ -774,7 +774,7 @@ irqreturn_t tms9914_interrupt_have_status(gpib_board_t *board, struct tms9914_pr
}
if (status1 & HR_ERR) {
- GPIB_DPRINTK("gpib bus error\n");
+ dev_dbg(board->gpib_dev, "gpib bus error\n");
set_bit(BUS_ERROR_BN, &priv->state);
}
@@ -807,7 +807,7 @@ irqreturn_t tms9914_interrupt_have_status(gpib_board_t *board, struct tms9914_pr
}
if ((status0 & priv->imr0_bits) || (status1 & priv->imr1_bits)) {
-// GPIB_DPRINTK("isr0 0x%x, imr0 0x%x, isr1 0x%x, imr1 0x%x\n",
+// dev_dbg(board->gpib_dev, "isr0 0x%x, imr0 0x%x, isr1 0x%x, imr1 0x%x\n",
// status0, priv->imr0_bits, status1, priv->imr1_bits);
update_status_nolock(board, priv);
wake_up_interruptible(&board->wait);
diff --git a/drivers/staging/gpib/tnt4882/tnt4882_gpib.c b/drivers/staging/gpib/tnt4882/tnt4882_gpib.c
index 4d702c4452e8..e49a952fa0d8 100644
--- a/drivers/staging/gpib/tnt4882/tnt4882_gpib.c
+++ b/drivers/staging/gpib/tnt4882/tnt4882_gpib.c
@@ -491,7 +491,7 @@ static int write_wait(gpib_board_t *board, struct tnt4882_priv *tnt_priv,
test_bit(BUS_ERROR_BN, &nec_priv->state) ||
test_bit(DEV_CLEAR_BN, &nec_priv->state) ||
test_bit(TIMO_NUM, &board->status))) {
- GPIB_DPRINTK("gpib write interrupted\n");
+ dev_dbg(board->gpib_dev, "gpib write interrupted\n");
return -ERESTARTSYS;
}
if (test_bit(TIMO_NUM, &board->status)) {
@@ -637,9 +637,8 @@ irqreturn_t tnt4882_internal_interrupt(gpib_board_t *board)
if (isr3_bits & HR_DONE)
priv->imr3_bits &= ~HR_DONE;
if (isr3_bits & (HR_INTR | HR_TLCI)) {
- GPIB_DPRINTK("tnt4882: minor %i isr0 0x%x imr0 0x%x isr3 0x%x imr3 0x%x\n",
- board->minor,
- isr0_bits, priv->imr0_bits, isr3_bits, imr3_bits);
+ dev_dbg(board->gpib_dev, "tnt4882: minor %i isr0 0x%x imr0 0x%x isr3 0x%x imr3 0x%x\n",
+ board->minor, isr0_bits, priv->imr0_bits, isr3_bits, imr3_bits);
tnt_writeb(priv, priv->imr3_bits, IMR3);
wake_up_interruptible(&board->wait);
}
--
2.46.2
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 03/11] staging: gpib: Update messaging and usb_device refs in ni_usb
2024-11-03 21:26 [PATCH v2 00/11] staging: gpib: Patch set for gpib staging drivers Dave Penkler
2024-11-03 21:26 ` [PATCH 01/11] staging: gpib: Fix buffer overflow in ni_usb_init Dave Penkler
2024-11-03 21:26 ` [PATCH 02/11] staging: gpib: Replace custom debug with dev_dbg Dave Penkler
@ 2024-11-03 21:26 ` Dave Penkler
2024-11-03 21:26 ` [PATCH 04/11] staging: gpib: Update messaging and usb_device refs in agilent_usb Dave Penkler
` (7 subsequent siblings)
10 siblings, 0 replies; 16+ messages in thread
From: Dave Penkler @ 2024-11-03 21:26 UTC (permalink / raw)
To: gregkh, linux-staging, linux-kernel
Cc: skhan, arnd, dan.carpenter, Dave Penkler
Replace GPIB_DPRINTK with dev_dbg
Replace pr_xxx with dev_xxx wherever possible
Use previously initialized usb_device pointer
for usb_get_dev() and usb_put_dev().
Signed-off-by: Dave Penkler <dpenkler@gmail.com>
---
drivers/staging/gpib/ni_usb/ni_usb_gpib.c | 376 ++++++++++++----------
1 file changed, 204 insertions(+), 172 deletions(-)
diff --git a/drivers/staging/gpib/ni_usb/ni_usb_gpib.c b/drivers/staging/gpib/ni_usb/ni_usb_gpib.c
index b7550a937f15..b7b6fb1be379 100644
--- a/drivers/staging/gpib/ni_usb/ni_usb_gpib.c
+++ b/drivers/staging/gpib/ni_usb/ni_usb_gpib.c
@@ -132,13 +132,13 @@ static int ni_usb_nonblocking_send_bulk_msg(struct ni_usb_priv *ni_priv, void *d
if (timeout_msecs)
mod_timer(&ni_priv->bulk_timer, jiffies + msecs_to_jiffies(timeout_msecs));
- //pr_err("%s: submitting urb\n", __func__);
retval = usb_submit_urb(ni_priv->bulk_urb, GFP_KERNEL);
if (retval) {
del_timer_sync(&ni_priv->bulk_timer);
usb_free_urb(ni_priv->bulk_urb);
ni_priv->bulk_urb = NULL;
- pr_err("%s: failed to submit bulk out urb, retval=%i\n", __func__, retval);
+ dev_err(&usb_dev->dev, "%s: failed to submit bulk out urb, retval=%i\n",
+ __func__, retval);
mutex_unlock(&ni_priv->bulk_transfer_lock);
return retval;
}
@@ -146,7 +146,7 @@ static int ni_usb_nonblocking_send_bulk_msg(struct ni_usb_priv *ni_priv, void *d
down(&context->complete); // wait for ni_usb_bulk_complete
if (context->timed_out) {
usb_kill_urb(ni_priv->bulk_urb);
- pr_err("%s: killed urb due to timeout\n", __func__);
+ dev_err(&usb_dev->dev, "%s: killed urb due to timeout\n", __func__);
retval = -ETIMEDOUT;
} else {
retval = ni_priv->bulk_urb->status;
@@ -224,7 +224,8 @@ static int ni_usb_nonblocking_receive_bulk_msg(struct ni_usb_priv *ni_priv,
del_timer_sync(&ni_priv->bulk_timer);
usb_free_urb(ni_priv->bulk_urb);
ni_priv->bulk_urb = NULL;
- pr_err("%s: failed to submit bulk out urb, retval=%i\n", __func__, retval);
+ dev_err(&usb_dev->dev, "%s: failed to submit bulk out urb, retval=%i\n",
+ __func__, retval);
mutex_unlock(&ni_priv->bulk_transfer_lock);
return retval;
}
@@ -249,7 +250,7 @@ static int ni_usb_nonblocking_receive_bulk_msg(struct ni_usb_priv *ni_priv,
}
if (context->timed_out) {
usb_kill_urb(ni_priv->bulk_urb);
- pr_err("%s: killed urb due to timeout\n", __func__);
+ dev_err(&usb_dev->dev, "%s: killed urb due to timeout\n", __func__);
retval = -ETIMEDOUT;
} else {
if (ni_priv->bulk_urb->status)
@@ -315,6 +316,7 @@ static void ni_usb_soft_update_status(gpib_board_t *board, unsigned int ni_usb_i
static const unsigned int ni_usb_ibsta_mask = SRQI | ATN | CIC | REM | LACS | TACS | LOK;
struct ni_usb_priv *ni_priv = board->private_data;
+ struct usb_device *usb_dev = interface_to_usbdev(ni_priv->bus_interface);
unsigned int need_monitoring_bits = ni_usb_ibsta_monitor_mask;
unsigned long flags;
@@ -328,15 +330,14 @@ static void ni_usb_soft_update_status(gpib_board_t *board, unsigned int ni_usb_i
ni_priv->monitored_ibsta_bits &= ~ni_usb_ibsta;
need_monitoring_bits &= ~ni_priv->monitored_ibsta_bits; /* mm - monitored set */
spin_unlock_irqrestore(&board->spinlock, flags);
-
- GPIB_DPRINTK("%s: need_monitoring_bits=0x%x\n", __func__, need_monitoring_bits);
+ dev_dbg(&usb_dev->dev, "%s: need_monitoring_bits=0x%x\n", __func__, need_monitoring_bits);
if (need_monitoring_bits & ~ni_usb_ibsta)
ni_usb_set_interrupt_monitor(board, ni_usb_ibsta_monitor_mask);
else if (need_monitoring_bits & ni_usb_ibsta)
wake_up_interruptible(&board->wait);
- GPIB_DPRINTK("%s: ni_usb_ibsta=0x%x\n", __func__, ni_usb_ibsta);
+ dev_dbg(&usb_dev->dev, "%s: ni_usb_ibsta=0x%x\n", __func__, ni_usb_ibsta);
}
static int ni_usb_parse_status_block(const u8 *buffer, struct ni_usb_status_block *status)
@@ -355,7 +356,6 @@ static int ni_usb_parse_status_block(const u8 *buffer, struct ni_usb_status_bloc
static void ni_usb_dump_raw_block(const u8 *raw_data, int length)
{
- pr_info("hex block dump\n");
print_hex_dump(KERN_INFO, "", DUMP_PREFIX_NONE, 8, 1, raw_data, length, true);
}
@@ -516,6 +516,7 @@ static int ni_usb_write_registers(struct ni_usb_priv *ni_priv,
const struct ni_usb_register *writes, int num_writes,
unsigned int *ibsta)
{
+ struct usb_device *usb_dev = interface_to_usbdev(ni_priv->bus_interface);
int retval;
u8 *out_data, *in_data;
int out_data_length;
@@ -530,7 +531,7 @@ static int ni_usb_write_registers(struct ni_usb_priv *ni_priv,
out_data_length = num_writes * bytes_per_write + 0x10;
out_data = kmalloc(out_data_length, GFP_KERNEL);
if (!out_data) {
- pr_err("%s: kmalloc failed\n", __func__);
+ dev_err(&usb_dev->dev, "%s: kmalloc failed\n", __func__);
return -ENOMEM;
}
i += ni_usb_bulk_register_write_header(&out_data[i], num_writes);
@@ -540,7 +541,7 @@ static int ni_usb_write_registers(struct ni_usb_priv *ni_priv,
out_data[i++] = 0x00;
i += ni_usb_bulk_termination(&out_data[i]);
if (i > out_data_length)
- pr_err("%s: bug! buffer overrun\n", __func__);
+ dev_err(&usb_dev->dev, "%s: bug! buffer overrun\n", __func__);
mutex_lock(&ni_priv->addressed_transfer_lock);
@@ -548,22 +549,22 @@ static int ni_usb_write_registers(struct ni_usb_priv *ni_priv,
kfree(out_data);
if (retval) {
mutex_unlock(&ni_priv->addressed_transfer_lock);
- pr_err("%s: ni_usb_send_bulk_msg returned %i, bytes_written=%i, i=%i\n",
- __func__, retval, bytes_written, i);
+ dev_err(&usb_dev->dev, "%s: ni_usb_send_bulk_msg returned %i, bytes_written=%i, i=%i\n",
+ __func__, retval, bytes_written, i);
return retval;
}
in_data = kmalloc(in_data_length, GFP_KERNEL);
if (!in_data) {
mutex_unlock(&ni_priv->addressed_transfer_lock);
- pr_err("%s: kmalloc failed\n", __func__);
+ dev_err(&usb_dev->dev, "%s: kmalloc failed\n", __func__);
return -ENOMEM;
}
retval = ni_usb_receive_bulk_msg(ni_priv, in_data, in_data_length, &bytes_read, 1000, 0);
if (retval || bytes_read != 16) {
mutex_unlock(&ni_priv->addressed_transfer_lock);
- pr_err("%s: ni_usb_receive_bulk_msg returned %i, bytes_read=%i\n",
- __func__, retval, bytes_read);
+ dev_err(&usb_dev->dev, "%s: ni_usb_receive_bulk_msg returned %i, bytes_read=%i\n",
+ __func__, retval, bytes_read);
ni_usb_dump_raw_block(in_data, bytes_read);
kfree(in_data);
return retval;
@@ -575,17 +576,18 @@ static int ni_usb_write_registers(struct ni_usb_priv *ni_priv,
//FIXME parse extra 09 status bits and termination
kfree(in_data);
if (status.id != NIUSB_REG_WRITE_ID) {
- pr_err("%s: parse error, id=0x%x != NIUSB_REG_WRITE_ID\n",
- __func__, status.id);
+ dev_err(&usb_dev->dev, "%s: parse error, id=0x%x != NIUSB_REG_WRITE_ID\n",
+ __func__, status.id);
return -EIO;
}
if (status.error_code) {
- pr_err("%s: nonzero error code 0x%x\n", __func__, status.error_code);
+ dev_err(&usb_dev->dev, "%s: nonzero error code 0x%x\n",
+ __func__, status.error_code);
return -EIO;
}
if (reg_writes_completed != num_writes) {
- pr_err("%s: reg_writes_completed=%i, num_writes=%i\n", __func__,
- reg_writes_completed, num_writes);
+ dev_err(&usb_dev->dev, "%s: reg_writes_completed=%i, num_writes=%i\n",
+ __func__, reg_writes_completed, num_writes);
return -EIO;
}
if (ibsta)
@@ -599,6 +601,7 @@ static int ni_usb_read(gpib_board_t *board, uint8_t *buffer, size_t length,
{
int retval, parse_retval;
struct ni_usb_priv *ni_priv = board->private_data;
+ struct usb_device *usb_dev = interface_to_usbdev(ni_priv->bus_interface);
u8 *out_data, *in_data;
static const int out_data_length = 0x20;
int in_data_length;
@@ -613,7 +616,7 @@ static int ni_usb_read(gpib_board_t *board, uint8_t *buffer, size_t length,
*bytes_read = 0;
if (length > max_read_length) {
length = max_read_length;
- pr_err("%s: read length too long\n", __func__);
+ dev_err(&usb_dev->dev, "%s: read length too long\n", __func__);
}
out_data = kmalloc(out_data_length, GFP_KERNEL);
if (!out_data)
@@ -646,8 +649,8 @@ static int ni_usb_read(gpib_board_t *board, uint8_t *buffer, size_t length,
if (retval || usb_bytes_written != i) {
if (retval == 0)
retval = -EIO;
- pr_err("%s: ni_usb_send_bulk_msg returned %i, usb_bytes_written=%i, i=%i\n",
- __func__, retval, usb_bytes_written, i);
+ dev_err(&usb_dev->dev, "%s: ni_usb_send_bulk_msg returned %i, usb_bytes_written=%i, i=%i\n",
+ __func__, retval, usb_bytes_written, i);
mutex_unlock(&ni_priv->addressed_transfer_lock);
return retval;
}
@@ -665,8 +668,8 @@ static int ni_usb_read(gpib_board_t *board, uint8_t *buffer, size_t length,
if (retval == -ERESTARTSYS) {
} else if (retval) {
- pr_err("%s: ni_usb_receive_bulk_msg returned %i, usb_bytes_read=%i\n",
- __func__, retval, usb_bytes_read);
+ dev_err(&usb_dev->dev, "%s: ni_usb_receive_bulk_msg returned %i, usb_bytes_read=%i\n",
+ __func__, retval, usb_bytes_read);
kfree(in_data);
return retval;
}
@@ -674,14 +677,14 @@ static int ni_usb_read(gpib_board_t *board, uint8_t *buffer, size_t length,
if (parse_retval != usb_bytes_read) {
if (parse_retval >= 0)
parse_retval = -EIO;
- pr_err("%s: retval=%i usb_bytes_read=%i\n",
- __func__, parse_retval, usb_bytes_read);
+ dev_err(&usb_dev->dev, "%s: retval=%i usb_bytes_read=%i\n",
+ __func__, parse_retval, usb_bytes_read);
kfree(in_data);
return parse_retval;
}
if (actual_length != length - status.count) {
- pr_err("%s: actual_length=%i expected=%li\n",
- __func__, actual_length, (long)(length - status.count));
+ dev_err(&usb_dev->dev, "%s: actual_length=%i expected=%li\n",
+ __func__, actual_length, (long)(length - status.count));
ni_usb_dump_raw_block(in_data, usb_bytes_read);
}
kfree(in_data);
@@ -696,7 +699,7 @@ static int ni_usb_read(gpib_board_t *board, uint8_t *buffer, size_t length,
break;
case NIUSB_ATN_STATE_ERROR:
retval = -EIO;
- pr_err("%s: read when ATN set\n", __func__);
+ dev_err(&usb_dev->dev, "%s: read when ATN set\n", __func__);
break;
case NIUSB_ADDRESSING_ERROR:
retval = -EIO;
@@ -705,12 +708,12 @@ static int ni_usb_read(gpib_board_t *board, uint8_t *buffer, size_t length,
retval = -ETIMEDOUT;
break;
case NIUSB_EOSMODE_ERROR:
- pr_err("%s: driver bug, we should have been able to avoid NIUSB_EOSMODE_ERROR.\n",
- __func__);
+ dev_err(&usb_dev->dev, "%s: driver bug, we should have been able to avoid NIUSB_EOSMODE_ERROR.\n",
+ __func__);
retval = -EINVAL;
break;
default:
- pr_err("%s: unknown error code=%i\n", __func__, status.error_code);
+ dev_err(&usb_dev->dev, "%s: unknown error code=%i\n", __func__, status.error_code);
retval = -EIO;
break;
}
@@ -728,6 +731,7 @@ static int ni_usb_write(gpib_board_t *board, uint8_t *buffer, size_t length,
{
int retval;
struct ni_usb_priv *ni_priv = board->private_data;
+ struct usb_device *usb_dev = interface_to_usbdev(ni_priv->bus_interface);
u8 *out_data, *in_data;
int out_data_length;
static const int in_data_length = 0x10;
@@ -741,7 +745,7 @@ static int ni_usb_write(gpib_board_t *board, uint8_t *buffer, size_t length,
if (length > max_write_length) {
length = max_write_length;
send_eoi = 0;
- pr_err("%s: write length too long\n", __func__);
+ dev_err(&usb_dev->dev, "%s: write length too long\n", __func__);
}
out_data_length = length + 0x10;
out_data = kmalloc(out_data_length, GFP_KERNEL);
@@ -773,8 +777,8 @@ static int ni_usb_write(gpib_board_t *board, uint8_t *buffer, size_t length,
kfree(out_data);
if (retval || usb_bytes_written != i) {
mutex_unlock(&ni_priv->addressed_transfer_lock);
- pr_err("%s: ni_usb_send_bulk_msg returned %i, usb_bytes_written=%i, i=%i\n",
- __func__, retval, usb_bytes_written, i);
+ dev_err(&usb_dev->dev, "%s: ni_usb_send_bulk_msg returned %i, usb_bytes_written=%i, i=%i\n",
+ __func__, retval, usb_bytes_written, i);
return retval;
}
@@ -787,8 +791,8 @@ static int ni_usb_write(gpib_board_t *board, uint8_t *buffer, size_t length,
mutex_unlock(&ni_priv->addressed_transfer_lock);
if ((retval && retval != -ERESTARTSYS) || usb_bytes_read != 12) {
- pr_err("%s: ni_usb_receive_bulk_msg returned %i, usb_bytes_read=%i\n",
- __func__, retval, usb_bytes_read);
+ dev_err(&usb_dev->dev, "%s: ni_usb_receive_bulk_msg returned %i, usb_bytes_read=%i\n",
+ __func__, retval, usb_bytes_read);
kfree(in_data);
return retval;
}
@@ -804,8 +808,8 @@ static int ni_usb_write(gpib_board_t *board, uint8_t *buffer, size_t length,
*/
break;
case NIUSB_ADDRESSING_ERROR:
- pr_err("%s: Addressing error retval %d error code=%i\n",
- __func__, retval, status.error_code);
+ dev_err(&usb_dev->dev, "%s: Addressing error retval %d error code=%i\n",
+ __func__, retval, status.error_code);
retval = -ENXIO;
break;
case NIUSB_NO_LISTENER_ERROR:
@@ -815,8 +819,8 @@ static int ni_usb_write(gpib_board_t *board, uint8_t *buffer, size_t length,
retval = -ETIMEDOUT;
break;
default:
- pr_err("%s: unknown error code=%i\n",
- __func__, status.error_code);
+ dev_err(&usb_dev->dev, "%s: unknown error code=%i\n",
+ __func__, status.error_code);
retval = -EPIPE;
break;
}
@@ -830,6 +834,7 @@ static int ni_usb_command_chunk(gpib_board_t *board, uint8_t *buffer, size_t len
{
int retval;
struct ni_usb_priv *ni_priv = board->private_data;
+ struct usb_device *usb_dev = interface_to_usbdev(ni_priv->bus_interface);
u8 *out_data, *in_data;
int out_data_length;
static const int in_data_length = 0x10;
@@ -866,8 +871,8 @@ static int ni_usb_command_chunk(gpib_board_t *board, uint8_t *buffer, size_t len
kfree(out_data);
if (retval || bytes_written != i) {
mutex_unlock(&ni_priv->addressed_transfer_lock);
- pr_err("%s: ni_usb_send_bulk_msg returned %i, bytes_written=%i, i=%i\n",
- __func__, retval, bytes_written, i);
+ dev_err(&usb_dev->dev, "%s: ni_usb_send_bulk_msg returned %i, bytes_written=%i, i=%i\n",
+ __func__, retval, bytes_written, i);
return retval;
}
@@ -883,8 +888,8 @@ static int ni_usb_command_chunk(gpib_board_t *board, uint8_t *buffer, size_t len
mutex_unlock(&ni_priv->addressed_transfer_lock);
if ((retval && retval != -ERESTARTSYS) || bytes_read != 12) {
- pr_err("%s: ni_usb_receive_bulk_msg returned %i, bytes_read=%i\n",
- __func__, retval, bytes_read);
+ dev_err(&usb_dev->dev, "%s: ni_usb_receive_bulk_msg returned %i, bytes_read=%i\n",
+ __func__, retval, bytes_read);
kfree(in_data);
return retval;
}
@@ -902,12 +907,12 @@ static int ni_usb_command_chunk(gpib_board_t *board, uint8_t *buffer, size_t len
case NIUSB_NO_BUS_ERROR:
return -ENOTCONN;
case NIUSB_EOSMODE_ERROR:
- pr_err("%s: got eosmode error. Driver bug?\n", __func__);
+ dev_err(&usb_dev->dev, "%s: got eosmode error. Driver bug?\n", __func__);
return -EIO;
case NIUSB_TIMEOUT_ERROR:
return -ETIMEDOUT;
default:
- pr_err("%s: unknown error code=%i\n", __func__, status.error_code);
+ dev_err(&usb_dev->dev, "%s: unknown error code=%i\n", __func__, status.error_code);
return -EIO;
}
ni_usb_soft_update_status(board, status.ibsta, 0);
@@ -935,6 +940,7 @@ static int ni_usb_take_control(gpib_board_t *board, int synchronous)
{
int retval;
struct ni_usb_priv *ni_priv = board->private_data;
+ struct usb_device *usb_dev = interface_to_usbdev(ni_priv->bus_interface);
u8 *out_data, *in_data;
static const int out_data_length = 0x10;
static const int in_data_length = 0x10;
@@ -960,15 +966,15 @@ static int ni_usb_take_control(gpib_board_t *board, int synchronous)
kfree(out_data);
if (retval || bytes_written != i) {
mutex_unlock(&ni_priv->addressed_transfer_lock);
- pr_err("%s: ni_usb_send_bulk_msg returned %i, bytes_written=%i, i=%i\n",
- __func__, retval, bytes_written, i);
+ dev_err(&usb_dev->dev, "%s: ni_usb_send_bulk_msg returned %i, bytes_written=%i, i=%i\n",
+ __func__, retval, bytes_written, i);
return retval;
}
in_data = kmalloc(in_data_length, GFP_KERNEL);
if (!in_data) {
mutex_unlock(&ni_priv->addressed_transfer_lock);
- pr_err("%s: kmalloc failed\n", __func__);
+ dev_err(&usb_dev->dev, "%s: kmalloc failed\n", __func__);
return -ENOMEM;
}
retval = ni_usb_receive_bulk_msg(ni_priv, in_data, in_data_length, &bytes_read, 1000, 1);
@@ -978,8 +984,8 @@ static int ni_usb_take_control(gpib_board_t *board, int synchronous)
if ((retval && retval != -ERESTARTSYS) || bytes_read != 12) {
if (retval == 0)
retval = -EIO;
- pr_err("%s: ni_usb_receive_bulk_msg returned %i, bytes_read=%i\n",
- __func__, retval, bytes_read);
+ dev_err(&usb_dev->dev, "%s: ni_usb_receive_bulk_msg returned %i, bytes_read=%i\n",
+ __func__, retval, bytes_read);
kfree(in_data);
return retval;
}
@@ -993,6 +999,7 @@ static int ni_usb_go_to_standby(gpib_board_t *board)
{
int retval;
struct ni_usb_priv *ni_priv = board->private_data;
+ struct usb_device *usb_dev = interface_to_usbdev(ni_priv->bus_interface);
u8 *out_data, *in_data;
static const int out_data_length = 0x10;
static const int in_data_length = 0x20;
@@ -1016,15 +1023,15 @@ static int ni_usb_go_to_standby(gpib_board_t *board)
kfree(out_data);
if (retval || bytes_written != i) {
mutex_unlock(&ni_priv->addressed_transfer_lock);
- pr_err("%s: ni_usb_send_bulk_msg returned %i, bytes_written=%i, i=%i\n",
- __func__, retval, bytes_written, i);
+ dev_err(&usb_dev->dev, "%s: ni_usb_send_bulk_msg returned %i, bytes_written=%i, i=%i\n",
+ __func__, retval, bytes_written, i);
return retval;
}
in_data = kmalloc(in_data_length, GFP_KERNEL);
if (!in_data) {
mutex_unlock(&ni_priv->addressed_transfer_lock);
- pr_err("%s: kmalloc failed\n", __FILE__);
+ dev_err(&usb_dev->dev, "%s: kmalloc failed\n", __func__);
return -ENOMEM;
}
retval = ni_usb_receive_bulk_msg(ni_priv, in_data, in_data_length, &bytes_read, 1000, 0);
@@ -1032,16 +1039,16 @@ static int ni_usb_go_to_standby(gpib_board_t *board)
mutex_unlock(&ni_priv->addressed_transfer_lock);
if (retval || bytes_read != 12) {
- pr_err("%s: ni_usb_receive_bulk_msg returned %i, bytes_read=%i\n",
- __func__, retval, bytes_read);
+ dev_err(&usb_dev->dev, "%s: ni_usb_receive_bulk_msg returned %i, bytes_read=%i\n",
+ __func__, retval, bytes_read);
kfree(in_data);
return retval;
}
ni_usb_parse_status_block(in_data, &status);
kfree(in_data);
if (status.id != NIUSB_IBGTS_ID)
- pr_err("%s: bug: status.id 0x%x != INUSB_IBGTS_ID\n",
- __func__, status.id);
+ dev_err(&usb_dev->dev, "%s: bug: status.id 0x%x != INUSB_IBGTS_ID\n",
+ __func__, status.id);
ni_usb_soft_update_status(board, status.ibsta, 0);
return 0;
}
@@ -1050,6 +1057,7 @@ static void ni_usb_request_system_control(gpib_board_t *board, int request_contr
{
int retval;
struct ni_usb_priv *ni_priv = board->private_data;
+ struct usb_device *usb_dev = interface_to_usbdev(ni_priv->bus_interface);
int i = 0;
struct ni_usb_register writes[4];
unsigned int ibsta;
@@ -1083,7 +1091,7 @@ static void ni_usb_request_system_control(gpib_board_t *board, int request_contr
}
retval = ni_usb_write_registers(ni_priv, writes, i, &ibsta);
if (retval < 0) {
- pr_err("%s: register write failed, retval=%i\n", __func__, retval);
+ dev_err(&usb_dev->dev, "%s: register write failed, retval=%i\n", __func__, retval);
return; // retval;
}
if (!request_control)
@@ -1097,6 +1105,7 @@ static void ni_usb_interface_clear(gpib_board_t *board, int assert)
{
int retval;
struct ni_usb_priv *ni_priv = board->private_data;
+ struct usb_device *usb_dev = interface_to_usbdev(ni_priv->bus_interface);
u8 *out_data, *in_data;
static const int out_data_length = 0x10;
static const int in_data_length = 0x10;
@@ -1109,7 +1118,7 @@ static void ni_usb_interface_clear(gpib_board_t *board, int assert)
return;
out_data = kmalloc(out_data_length, GFP_KERNEL);
if (!out_data) {
- pr_err("%s: kmalloc failed\n", __FILE__);
+ dev_err(&usb_dev->dev, "%s: kmalloc failed\n", __func__);
return;
}
out_data[i++] = NIUSB_IBSIC_ID;
@@ -1120,8 +1129,8 @@ static void ni_usb_interface_clear(gpib_board_t *board, int assert)
retval = ni_usb_send_bulk_msg(ni_priv, out_data, i, &bytes_written, 1000);
kfree(out_data);
if (retval || bytes_written != i) {
- pr_err("%s: ni_usb_send_bulk_msg returned %i, bytes_written=%i, i=%i\n",
- __func__, retval, bytes_written, i);
+ dev_err(&usb_dev->dev, "%s: ni_usb_send_bulk_msg returned %i, bytes_written=%i, i=%i\n",
+ __func__, retval, bytes_written, i);
return;
}
in_data = kmalloc(in_data_length, GFP_KERNEL);
@@ -1130,8 +1139,8 @@ static void ni_usb_interface_clear(gpib_board_t *board, int assert)
retval = ni_usb_receive_bulk_msg(ni_priv, in_data, in_data_length, &bytes_read, 1000, 0);
if (retval || bytes_read != 12) {
- pr_err("%s: ni_usb_receive_bulk_msg returned %i, bytes_read=%i\n",
- __func__, retval, bytes_read);
+ dev_err(&usb_dev->dev, "%s: ni_usb_receive_bulk_msg returned %i, bytes_read=%i\n",
+ __func__, retval, bytes_read);
kfree(in_data);
return;
}
@@ -1144,6 +1153,7 @@ static void ni_usb_remote_enable(gpib_board_t *board, int enable)
{
int retval;
struct ni_usb_priv *ni_priv = board->private_data;
+ struct usb_device *usb_dev = interface_to_usbdev(ni_priv->bus_interface);
struct ni_usb_register reg;
unsigned int ibsta;
@@ -1155,7 +1165,7 @@ static void ni_usb_remote_enable(gpib_board_t *board, int enable)
reg.value = AUX_CREN;
retval = ni_usb_write_registers(ni_priv, ®, 1, &ibsta);
if (retval < 0) {
- pr_err("%s: register write failed, retval=%i\n", __func__, retval);
+ dev_err(&usb_dev->dev, "%s: register write failed, retval=%i\n", __func__, retval);
return; //retval;
}
ni_priv->ren_state = enable;
@@ -1190,11 +1200,12 @@ static unsigned int ni_usb_update_status(gpib_board_t *board, unsigned int clear
{
int retval;
struct ni_usb_priv *ni_priv = board->private_data;
+ struct usb_device *usb_dev = interface_to_usbdev(ni_priv->bus_interface);
static const int buffer_length = 8;
u8 *buffer;
struct ni_usb_status_block status;
- //printk("%s: receive control pipe is %i\n", __FILE__, pipe);
+ //printk("%s: receive control pipe is %i\n", __func__, pipe);
buffer = kmalloc(buffer_length, GFP_KERNEL);
if (!buffer)
return board->status;
@@ -1203,7 +1214,7 @@ static unsigned int ni_usb_update_status(gpib_board_t *board, unsigned int clear
USB_TYPE_VENDOR | USB_RECIP_DEVICE,
0x200, 0x0, buffer, buffer_length, 1000);
if (retval != buffer_length) {
- pr_err("%s: usb_control_msg returned %i\n", __FILE__, retval);
+ dev_err(&usb_dev->dev, "%s: usb_control_msg returned %i\n", __func__, retval);
kfree(buffer);
return board->status;
}
@@ -1216,12 +1227,13 @@ static unsigned int ni_usb_update_status(gpib_board_t *board, unsigned int clear
// tells ni-usb to immediately stop an ongoing i/o operation
static void ni_usb_stop(struct ni_usb_priv *ni_priv)
{
+ struct usb_device *usb_dev = interface_to_usbdev(ni_priv->bus_interface);
int retval;
static const int buffer_length = 8;
u8 *buffer;
struct ni_usb_status_block status;
- //printk("%s: receive control pipe is %i\n", __FILE__, pipe);
+ //printk("%s: receive control pipe is %i\n", __func__, pipe);
buffer = kmalloc(buffer_length, GFP_KERNEL);
if (!buffer)
return;
@@ -1230,7 +1242,7 @@ static void ni_usb_stop(struct ni_usb_priv *ni_priv)
USB_TYPE_VENDOR | USB_RECIP_DEVICE,
0x0, 0x0, buffer, buffer_length, 1000);
if (retval != buffer_length) {
- pr_err("%s: usb_control_msg returned %i\n", __FILE__, retval);
+ dev_err(&usb_dev->dev, "%s: usb_control_msg returned %i\n", __func__, retval);
kfree(buffer);
return;
}
@@ -1242,6 +1254,7 @@ static int ni_usb_primary_address(gpib_board_t *board, unsigned int address)
{
int retval;
struct ni_usb_priv *ni_priv = board->private_data;
+ struct usb_device *usb_dev = interface_to_usbdev(ni_priv->bus_interface);
int i = 0;
struct ni_usb_register writes[2];
unsigned int ibsta;
@@ -1256,7 +1269,7 @@ static int ni_usb_primary_address(gpib_board_t *board, unsigned int address)
i++;
retval = ni_usb_write_registers(ni_priv, writes, i, &ibsta);
if (retval < 0) {
- pr_err("%s: register write failed, retval=%i\n", __func__, retval);
+ dev_err(&usb_dev->dev, "%s: register write failed, retval=%i\n", __func__, retval);
return retval;
}
ni_usb_soft_update_status(board, ibsta, 0);
@@ -1296,6 +1309,7 @@ static int ni_usb_secondary_address(gpib_board_t *board, unsigned int address, i
{
int retval;
struct ni_usb_priv *ni_priv = board->private_data;
+ struct usb_device *usb_dev = interface_to_usbdev(ni_priv->bus_interface);
int i = 0;
struct ni_usb_register writes[3];
unsigned int ibsta;
@@ -1303,7 +1317,7 @@ static int ni_usb_secondary_address(gpib_board_t *board, unsigned int address, i
i += ni_usb_write_sad(writes, address, enable);
retval = ni_usb_write_registers(ni_priv, writes, i, &ibsta);
if (retval < 0) {
- pr_err("%s: register write failed, retval=%i\n", __func__, retval);
+ dev_err(&usb_dev->dev, "%s: register write failed, retval=%i\n", __func__, retval);
return retval;
}
ni_usb_soft_update_status(board, ibsta, 0);
@@ -1314,6 +1328,7 @@ static int ni_usb_parallel_poll(gpib_board_t *board, uint8_t *result)
{
int retval;
struct ni_usb_priv *ni_priv = board->private_data;
+ struct usb_device *usb_dev = interface_to_usbdev(ni_priv->bus_interface);
u8 *out_data, *in_data;
static const int out_data_length = 0x10;
static const int in_data_length = 0x20;
@@ -1336,8 +1351,8 @@ static int ni_usb_parallel_poll(gpib_board_t *board, uint8_t *result)
kfree(out_data);
if (retval || bytes_written != i) {
- pr_err("%s: ni_usb_send_bulk_msg returned %i, bytes_written=%i, i=%i\n",
- __func__, retval, bytes_written, i);
+ dev_err(&usb_dev->dev, "%s: ni_usb_send_bulk_msg returned %i, bytes_written=%i, i=%i\n",
+ __func__, retval, bytes_written, i);
return retval;
}
in_data = kmalloc(in_data_length, GFP_KERNEL);
@@ -1349,8 +1364,8 @@ static int ni_usb_parallel_poll(gpib_board_t *board, uint8_t *result)
&bytes_read, 1000, 1);
if (retval && retval != -ERESTARTSYS) {
- pr_err("%s: ni_usb_receive_bulk_msg returned %i, bytes_read=%i\n",
- __func__, retval, bytes_read);
+ dev_err(&usb_dev->dev, "%s: ni_usb_receive_bulk_msg returned %i, bytes_read=%i\n",
+ __func__, retval, bytes_read);
kfree(in_data);
return retval;
}
@@ -1365,6 +1380,7 @@ static void ni_usb_parallel_poll_configure(gpib_board_t *board, uint8_t config)
{
int retval;
struct ni_usb_priv *ni_priv = board->private_data;
+ struct usb_device *usb_dev = interface_to_usbdev(ni_priv->bus_interface);
int i = 0;
struct ni_usb_register writes[1];
unsigned int ibsta;
@@ -1375,7 +1391,7 @@ static void ni_usb_parallel_poll_configure(gpib_board_t *board, uint8_t config)
i++;
retval = ni_usb_write_registers(ni_priv, writes, i, &ibsta);
if (retval < 0) {
- pr_err("%s: register write failed, retval=%i\n", __func__, retval);
+ dev_err(&usb_dev->dev, "%s: register write failed, retval=%i\n", __func__, retval);
return;// retval;
}
ni_usb_soft_update_status(board, ibsta, 0);
@@ -1386,6 +1402,7 @@ static void ni_usb_parallel_poll_response(gpib_board_t *board, int ist)
{
int retval;
struct ni_usb_priv *ni_priv = board->private_data;
+ struct usb_device *usb_dev = interface_to_usbdev(ni_priv->bus_interface);
int i = 0;
struct ni_usb_register writes[1];
unsigned int ibsta;
@@ -1399,7 +1416,7 @@ static void ni_usb_parallel_poll_response(gpib_board_t *board, int ist)
i++;
retval = ni_usb_write_registers(ni_priv, writes, i, &ibsta);
if (retval < 0) {
- pr_err("%s: register write failed, retval=%i\n", __func__, retval);
+ dev_err(&usb_dev->dev, "%s: register write failed, retval=%i\n", __func__, retval);
return;// retval;
}
ni_usb_soft_update_status(board, ibsta, 0);
@@ -1410,6 +1427,7 @@ static void ni_usb_serial_poll_response(gpib_board_t *board, u8 status)
{
int retval;
struct ni_usb_priv *ni_priv = board->private_data;
+ struct usb_device *usb_dev = interface_to_usbdev(ni_priv->bus_interface);
int i = 0;
struct ni_usb_register writes[1];
unsigned int ibsta;
@@ -1420,7 +1438,7 @@ static void ni_usb_serial_poll_response(gpib_board_t *board, u8 status)
i++;
retval = ni_usb_write_registers(ni_priv, writes, i, &ibsta);
if (retval < 0) {
- pr_err("%s: register write failed, retval=%i\n", __func__, retval);
+ dev_err(&usb_dev->dev, "%s: register write failed, retval=%i\n", __func__, retval);
return;// retval;
}
ni_usb_soft_update_status(board, ibsta, 0);
@@ -1436,6 +1454,7 @@ static void ni_usb_return_to_local(gpib_board_t *board)
{
int retval;
struct ni_usb_priv *ni_priv = board->private_data;
+ struct usb_device *usb_dev = interface_to_usbdev(ni_priv->bus_interface);
int i = 0;
struct ni_usb_register writes[1];
unsigned int ibsta;
@@ -1446,7 +1465,7 @@ static void ni_usb_return_to_local(gpib_board_t *board)
i++;
retval = ni_usb_write_registers(ni_priv, writes, i, &ibsta);
if (retval < 0) {
- pr_err("%s: register write failed, retval=%i\n", __func__, retval);
+ dev_err(&usb_dev->dev, "%s: register write failed, retval=%i\n", __func__, retval);
return;// retval;
}
ni_usb_soft_update_status(board, ibsta, 0);
@@ -1457,6 +1476,7 @@ static int ni_usb_line_status(const gpib_board_t *board)
{
int retval;
struct ni_usb_priv *ni_priv = board->private_data;
+ struct usb_device *usb_dev = interface_to_usbdev(ni_priv->bus_interface);
u8 *out_data, *in_data;
static const int out_data_length = 0x20;
static const int in_data_length = 0x20;
@@ -1487,15 +1507,15 @@ static int ni_usb_line_status(const gpib_board_t *board)
if (retval || bytes_written != i) {
mutex_unlock(&ni_priv->addressed_transfer_lock);
if (retval != -EAGAIN)
- pr_err("%s: ni_usb_send_bulk_msg returned %i, bytes_written=%i, i=%i\n",
- __func__, retval, bytes_written, i);
+ dev_err(&usb_dev->dev, "%s: ni_usb_send_bulk_msg returned %i, bytes_written=%i, i=%i\n",
+ __func__, retval, bytes_written, i);
return retval;
}
in_data = kmalloc(in_data_length, GFP_KERNEL);
if (!in_data) {
mutex_unlock(&ni_priv->addressed_transfer_lock);
- pr_err("%s: kmalloc failed\n", __FILE__);
+ dev_err(&usb_dev->dev, "%s: kmalloc failed\n", __func__);
return -ENOMEM;
}
retval = ni_usb_nonblocking_receive_bulk_msg(ni_priv, in_data, in_data_length,
@@ -1505,8 +1525,8 @@ static int ni_usb_line_status(const gpib_board_t *board)
if (retval) {
if (retval != -EAGAIN)
- pr_err("%s: ni_usb_receive_bulk_msg returned %i, bytes_read=%i\n",
- __func__, retval, bytes_read);
+ dev_err(&usb_dev->dev, "%s: ni_usb_receive_bulk_msg returned %i, bytes_read=%i\n",
+ __func__, retval, bytes_read);
kfree(in_data);
return retval;
}
@@ -1573,6 +1593,7 @@ static unsigned int ni_usb_t1_delay(gpib_board_t *board, unsigned int nano_sec)
{
int retval;
struct ni_usb_priv *ni_priv = board->private_data;
+ struct usb_device *usb_dev = interface_to_usbdev(ni_priv->bus_interface);
struct ni_usb_register writes[3];
unsigned int ibsta;
unsigned int actual_ns;
@@ -1581,7 +1602,7 @@ static unsigned int ni_usb_t1_delay(gpib_board_t *board, unsigned int nano_sec)
i = ni_usb_setup_t1_delay(writes, nano_sec, &actual_ns);
retval = ni_usb_write_registers(ni_priv, writes, i, &ibsta);
if (retval < 0) {
- pr_err("%s: register write failed, retval=%i\n", __func__, retval);
+ dev_err(&usb_dev->dev, "%s: register write failed, retval=%i\n", __func__, retval);
return -1; //FIXME should change return type to int for error reporting
}
board->t1_nano_sec = actual_ns;
@@ -1615,6 +1636,7 @@ static void ni_usb_free_private(struct ni_usb_priv *ni_priv)
static int ni_usb_setup_init(gpib_board_t *board, struct ni_usb_register *writes)
{
struct ni_usb_priv *ni_priv = board->private_data;
+ struct usb_device *usb_dev = interface_to_usbdev(ni_priv->bus_interface);
unsigned int mask, actual_ns;
int i = 0;
@@ -1712,7 +1734,7 @@ static int ni_usb_setup_init(gpib_board_t *board, struct ni_usb_register *writes
writes[i].value = AUX_CPPF;
i++;
if (i > NUM_INIT_WRITES) {
- pr_err("%s: bug!, buffer overrun, i=%i\n", __func__, i);
+ dev_err(&usb_dev->dev, "%s: bug!, buffer overrun, i=%i\n", __func__, i);
return 0;
}
return i;
@@ -1722,6 +1744,7 @@ static int ni_usb_init(gpib_board_t *board)
{
int retval;
struct ni_usb_priv *ni_priv = board->private_data;
+ struct usb_device *usb_dev = interface_to_usbdev(ni_priv->bus_interface);
struct ni_usb_register *writes;
unsigned int ibsta;
int writes_len;
@@ -1737,7 +1760,7 @@ static int ni_usb_init(gpib_board_t *board)
return -EFAULT;
kfree(writes);
if (retval) {
- pr_err("%s: register write failed, retval=%i\n", __func__, retval);
+ dev_err(&usb_dev->dev, "%s: register write failed, retval=%i\n", __func__, retval);
return retval;
}
ni_usb_soft_update_status(board, ibsta, 0);
@@ -1748,6 +1771,7 @@ static void ni_usb_interrupt_complete(struct urb *urb)
{
gpib_board_t *board = urb->context;
struct ni_usb_priv *ni_priv = board->private_data;
+ struct usb_device *usb_dev = interface_to_usbdev(ni_priv->bus_interface);
int retval;
struct ni_usb_status_block status;
unsigned long flags;
@@ -1767,7 +1791,7 @@ static void ni_usb_interrupt_complete(struct urb *urb)
default: /* other error, resubmit */
retval = usb_submit_urb(ni_priv->interrupt_urb, GFP_ATOMIC);
if (retval)
- pr_err("%s: failed to resubmit interrupt urb\n", __func__);
+ dev_err(&usb_dev->dev, "%s: failed to resubmit interrupt urb\n", __func__);
return;
}
@@ -1783,32 +1807,34 @@ static void ni_usb_interrupt_complete(struct urb *urb)
retval = usb_submit_urb(ni_priv->interrupt_urb, GFP_ATOMIC);
if (retval)
- pr_err("%s: failed to resubmit interrupt urb\n", __func__);
+ dev_err(&usb_dev->dev, "%s: failed to resubmit interrupt urb\n", __func__);
}
static int ni_usb_set_interrupt_monitor(gpib_board_t *board, unsigned int monitored_bits)
{
int retval;
struct ni_usb_priv *ni_priv = board->private_data;
+ struct usb_device *usb_dev = interface_to_usbdev(ni_priv->bus_interface);
static const int buffer_length = 8;
u8 *buffer;
struct ni_usb_status_block status;
unsigned long flags;
- //printk("%s: receive control pipe is %i\n", __FILE__, pipe);
+ //printk("%s: receive control pipe is %i\n", __func__, pipe);
buffer = kmalloc(buffer_length, GFP_KERNEL);
if (!buffer)
return -ENOMEM;
spin_lock_irqsave(&board->spinlock, flags);
ni_priv->monitored_ibsta_bits = ni_usb_ibsta_monitor_mask & monitored_bits;
-// pr_err("debug: %s: monitored_ibsta_bits=0x%x\n", __func__, ni_priv->monitored_ibsta_bits);
+// dev_err(&usb_dev->dev, "debug: %s: monitored_ibsta_bits=0x%x\n",
+// __func__, ni_priv->monitored_ibsta_bits);
spin_unlock_irqrestore(&board->spinlock, flags);
retval = ni_usb_receive_control_msg(ni_priv, NI_USB_WAIT_REQUEST, USB_DIR_IN |
USB_TYPE_VENDOR | USB_RECIP_DEVICE,
0x300, ni_usb_ibsta_monitor_mask & monitored_bits,
buffer, buffer_length, 1000);
if (retval != buffer_length) {
- pr_err("%s: usb_control_msg returned %i\n", __FILE__, retval);
+ dev_err(&usb_dev->dev, "%s: usb_control_msg returned %i\n", __func__, retval);
kfree(buffer);
return -1;
}
@@ -1844,7 +1870,8 @@ static int ni_usb_setup_urbs(gpib_board_t *board)
retval = usb_submit_urb(ni_priv->interrupt_urb, GFP_KERNEL);
mutex_unlock(&ni_priv->interrupt_transfer_lock);
if (retval) {
- pr_err("%s: failed to submit first interrupt urb, retval=%i\n", __FILE__, retval);
+ dev_err(&usb_dev->dev, "%s: failed to submit first interrupt urb, retval=%i\n",
+ __func__, retval);
return retval;
}
return 0;
@@ -1862,6 +1889,7 @@ static void ni_usb_cleanup_urbs(struct ni_usb_priv *ni_priv)
static int ni_usb_b_read_serial_number(struct ni_usb_priv *ni_priv)
{
+ struct usb_device *usb_dev = interface_to_usbdev(ni_priv->bus_interface);
int retval;
u8 *out_data;
u8 *in_data;
@@ -1894,20 +1922,20 @@ static int ni_usb_b_read_serial_number(struct ni_usb_priv *ni_priv)
i += ni_usb_bulk_termination(&out_data[i]);
retval = ni_usb_send_bulk_msg(ni_priv, out_data, out_data_length, &bytes_written, 1000);
if (retval) {
- pr_err("%s: ni_usb_send_bulk_msg returned %i, bytes_written=%i, i=%li\n",
- __func__,
- retval, bytes_written, (long)out_data_length);
+ dev_err(&usb_dev->dev, "%s: ni_usb_send_bulk_msg returned %i, bytes_written=%i, i=%li\n",
+ __func__,
+ retval, bytes_written, (long)out_data_length);
goto serial_out;
}
retval = ni_usb_receive_bulk_msg(ni_priv, in_data, in_data_length, &bytes_read, 1000, 0);
if (retval) {
- pr_err("%s: ni_usb_receive_bulk_msg returned %i, bytes_read=%i\n",
- __func__, retval, bytes_read);
+ dev_err(&usb_dev->dev, "%s: ni_usb_receive_bulk_msg returned %i, bytes_read=%i\n",
+ __func__, retval, bytes_read);
ni_usb_dump_raw_block(in_data, bytes_read);
goto serial_out;
}
if (ARRAY_SIZE(results) < num_reads) {
- pr_err("Setup bug\n");
+ dev_err(&usb_dev->dev, "Setup bug\n");
retval = -EINVAL;
goto serial_out;
}
@@ -1915,7 +1943,7 @@ static int ni_usb_b_read_serial_number(struct ni_usb_priv *ni_priv)
serial_number = 0;
for (j = 0; j < num_reads; ++j)
serial_number |= (results[j] & 0xff) << (8 * j);
- pr_info("%s: board serial number is 0x%x\n", __func__, serial_number);
+ dev_info(&usb_dev->dev, "%s: board serial number is 0x%x\n", __func__, serial_number);
retval = 0;
serial_out:
kfree(in_data);
@@ -1925,6 +1953,7 @@ static int ni_usb_b_read_serial_number(struct ni_usb_priv *ni_priv)
static int ni_usb_hs_wait_for_ready(struct ni_usb_priv *ni_priv)
{
+ struct usb_device *usb_dev = interface_to_usbdev(ni_priv->bus_interface);
static const int buffer_size = 0x10;
static const int timeout = 50;
static const int msec_sleep_duration = 100;
@@ -1942,22 +1971,22 @@ static int ni_usb_hs_wait_for_ready(struct ni_usb_priv *ni_priv)
USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
0x0, 0x0, buffer, buffer_size, 1000);
if (retval < 0) {
- pr_err("%s: usb_control_msg request 0x%x returned %i\n",
- __FILE__, NI_USB_SERIAL_NUMBER_REQUEST, retval);
+ dev_err(&usb_dev->dev, "%s: usb_control_msg request 0x%x returned %i\n",
+ __func__, NI_USB_SERIAL_NUMBER_REQUEST, retval);
goto ready_out;
}
j = 0;
if (buffer[j] != NI_USB_SERIAL_NUMBER_REQUEST) {
- pr_err("%s: unexpected data: buffer[%i]=0x%x, expected 0x%x\n",
- __func__, j, (int)buffer[j], NI_USB_SERIAL_NUMBER_REQUEST);
+ dev_err(&usb_dev->dev, "%s: unexpected data: buffer[%i]=0x%x, expected 0x%x\n",
+ __func__, j, (int)buffer[j], NI_USB_SERIAL_NUMBER_REQUEST);
unexpected = 1;
}
if (unexpected)
ni_usb_dump_raw_block(buffer, retval);
// NI-USB-HS+ pads the serial with 0x0 to make 16 bytes
if (retval != 5 && retval != 16) {
- pr_err("%s: received unexpected number of bytes = %i, expected 5 or 16\n",
- __func__, retval);
+ dev_err(&usb_dev->dev, "%s: received unexpected number of bytes = %i, expected 5 or 16\n",
+ __func__, retval);
ni_usb_dump_raw_block(buffer, retval);
}
serial_number = 0;
@@ -1965,7 +1994,7 @@ static int ni_usb_hs_wait_for_ready(struct ni_usb_priv *ni_priv)
serial_number |= (buffer[++j] << 8);
serial_number |= (buffer[++j] << 16);
serial_number |= (buffer[++j] << 24);
- pr_info("%s: board serial number is 0x%x\n", __func__, serial_number);
+ dev_info(&usb_dev->dev, "%s: board serial number is 0x%x\n", __func__, serial_number);
for (i = 0; i < timeout; ++i) {
int ready = 0;
@@ -1973,26 +2002,26 @@ static int ni_usb_hs_wait_for_ready(struct ni_usb_priv *ni_priv)
USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
0x0, 0x0, buffer, buffer_size, 100);
if (retval < 0) {
- pr_err("%s: usb_control_msg request 0x%x returned %i\n",
- __func__, NI_USB_POLL_READY_REQUEST, retval);
+ dev_err(&usb_dev->dev, "%s: usb_control_msg request 0x%x returned %i\n",
+ __func__, NI_USB_POLL_READY_REQUEST, retval);
goto ready_out;
}
j = 0;
unexpected = 0;
if (buffer[j] != NI_USB_POLL_READY_REQUEST) { // [0]
- pr_err("%s: unexpected data: buffer[%i]=0x%x, expected 0x%x\n",
- __func__, j, (int)buffer[j], NI_USB_POLL_READY_REQUEST);
+ dev_err(&usb_dev->dev, "%s: unexpected data: buffer[%i]=0x%x, expected 0x%x\n",
+ __func__, j, (int)buffer[j], NI_USB_POLL_READY_REQUEST);
unexpected = 1;
}
++j;
if (buffer[j] != 0x1 && buffer[j] != 0x0) { // [1] HS+ sends 0x0
- pr_err("%s: unexpected data: buffer[%i]=0x%x, expected 0x1 or 0x0\n",
- __func__, j, (int)buffer[j]);
+ dev_err(&usb_dev->dev, "%s: unexpected data: buffer[%i]=0x%x, expected 0x1 or 0x0\n",
+ __func__, j, (int)buffer[j]);
unexpected = 1;
}
if (buffer[++j] != 0x0) { // [2]
- pr_err("%s: unexpected data: buffer[%i]=0x%x, expected 0x%x\n",
- __func__, j, (int)buffer[j], 0x0);
+ dev_err(&usb_dev->dev, "%s: unexpected data: buffer[%i]=0x%x, expected 0x%x\n",
+ __func__, j, (int)buffer[j], 0x0);
unexpected = 1;
}
++j;
@@ -2000,22 +2029,22 @@ static int ni_usb_hs_wait_for_ready(struct ni_usb_priv *ni_priv)
// NI-USB-HS+ sends 0x0
if (buffer[j] != 0x1 && buffer[j] != 0x8 && buffer[j] != 0x7 && buffer[j] != 0x0) {
// [3]
- pr_err("%s: unexpected data: buffer[%i]=0x%x, expected 0x0, 0x1, 0x7 or 0x8\n",
- __func__, j, (int)buffer[j]);
+ dev_err(&usb_dev->dev, "%s: unexpected data: buffer[%i]=0x%x, expected 0x0, 0x1, 0x7 or 0x8\n",
+ __func__, j, (int)buffer[j]);
unexpected = 1;
}
++j;
// NI-USB-HS+ sends 0 here
if (buffer[j] != 0x30 && buffer[j] != 0x0) { // [4]
- pr_err("%s: unexpected data: buffer[%i]=0x%x, expected 0x0 or 0x30\n",
- __func__, j, (int)buffer[j]);
+ dev_err(&usb_dev->dev, "%s: unexpected data: buffer[%i]=0x%x, expected 0x0 or 0x30\n",
+ __func__, j, (int)buffer[j]);
unexpected = 1;
}
++j;
// MC usb-488 (and sometimes NI-USB-HS?) and NI-USB-HS+ sends 0x0 here
if (buffer[j] != 0x1 && buffer[j] != 0x0) { // [5]
- pr_err("%s: unexpected data: buffer[%i]=0x%x, expected 0x1 or 0x0\n",
- __func__, j, (int)buffer[j]);
+ dev_err(&usb_dev->dev, "%s: unexpected data: buffer[%i]=0x%x, expected 0x1 or 0x0\n",
+ __func__, j, (int)buffer[j]);
unexpected = 1;
}
if (buffer[++j] != 0x0) { // [6]
@@ -2023,8 +2052,8 @@ static int ni_usb_hs_wait_for_ready(struct ni_usb_priv *ni_priv)
// NI-USB-HS+ sends 0xf here
if (buffer[j] != 0x2 && buffer[j] != 0xe && buffer[j] != 0xf &&
buffer[j] != 0x16) {
- pr_err("%s: unexpected data: buffer[%i]=0x%x, expected 0x2, 0xe, 0xf or 0x16\n",
- __func__, j, (int)buffer[j]);
+ dev_err(&usb_dev->dev, "%s: unexpected data: buffer[%i]=0x%x, expected 0x2, 0xe, 0xf or 0x16\n",
+ __func__, j, (int)buffer[j]);
unexpected = 1;
}
}
@@ -2033,30 +2062,30 @@ static int ni_usb_hs_wait_for_ready(struct ni_usb_priv *ni_priv)
// MC usb-488 sends 0x5 here; MC usb-488A sends 0x6 here
if (buffer[j] != 0x3 && buffer[j] != 0x5 && buffer[j] != 0x6 &&
buffer[j] != 0x8) {
- pr_err("%s: unexpected data: buffer[%i]=0x%x, expected 0x3 or 0x5, 0x6 or 0x08\n",
- __func__, j, (int)buffer[j]);
+ dev_err(&usb_dev->dev, "%s: unexpected data: buffer[%i]=0x%x, expected 0x3 or 0x5, 0x6 or 0x08\n",
+ __func__, j, (int)buffer[j]);
unexpected = 1;
}
}
++j;
if (buffer[j] != 0x0 && buffer[j] != 0x2) { // [8] MC usb-488 sends 0x2 here
- pr_err("%s: unexpected data: buffer[%i]=0x%x, expected 0x0 or 0x2\n",
- __func__, j, (int)buffer[j]);
+ dev_err(&usb_dev->dev, "%s: unexpected data: buffer[%i]=0x%x, expected 0x0 or 0x2\n",
+ __func__, j, (int)buffer[j]);
unexpected = 1;
}
++j;
// MC usb-488A and NI-USB-HS sends 0x3 here; NI-USB-HS+ sends 0x30 here
if (buffer[j] != 0x0 && buffer[j] != 0x3 && buffer[j] != 0x30) { // [9]
- pr_err("%s: unexpected data: buffer[%i]=0x%x, expected 0x0, 0x3 or 0x30\n",
- __func__, j, (int)buffer[j]);
+ dev_err(&usb_dev->dev, "%s: unexpected data: buffer[%i]=0x%x, expected 0x0, 0x3 or 0x30\n",
+ __func__, j, (int)buffer[j]);
unexpected = 1;
}
if (buffer[++j] != 0x0) {
ready = 1;
if (buffer[j] != 0x96 && buffer[j] != 0x7 && buffer[j] != 0x6e) {
// [10] MC usb-488 sends 0x7 here
- pr_err("%s: unexpected data: buffer[%i]=0x%x, expected 0x96, 0x07 or 0x6e\n",
- __func__, j, (int)buffer[j]);
+ dev_err(&usb_dev->dev, "%s: unexpected data: buffer[%i]=0x%x, expected 0x96, 0x07 or 0x6e\n",
+ __func__, j, (int)buffer[j]);
unexpected = 1;
}
}
@@ -2066,7 +2095,7 @@ static int ni_usb_hs_wait_for_ready(struct ni_usb_priv *ni_priv)
break;
retval = msleep_interruptible(msec_sleep_duration);
if (retval) {
- pr_err("ni_usb_gpib: msleep interrupted\n");
+ dev_err(&usb_dev->dev, "ni_usb_gpib: msleep interrupted\n");
retval = -ERESTARTSYS;
goto ready_out;
}
@@ -2075,7 +2104,7 @@ static int ni_usb_hs_wait_for_ready(struct ni_usb_priv *ni_priv)
ready_out:
kfree(buffer);
- GPIB_DPRINTK("%s: %s exit retval=%d\n", __func__, retval);
+ dev_dbg(&usb_dev->dev, "%s: exit retval=%d\n", __func__, retval);
return retval;
}
@@ -2087,6 +2116,7 @@ static int ni_usb_hs_wait_for_ready(struct ni_usb_priv *ni_priv)
*/
static int ni_usb_hs_plus_extra_init(struct ni_usb_priv *ni_priv)
{
+ struct usb_device *usb_dev = interface_to_usbdev(ni_priv->bus_interface);
int retval;
u8 *buffer;
static const int buffer_size = 16;
@@ -2102,14 +2132,14 @@ static int ni_usb_hs_plus_extra_init(struct ni_usb_priv *ni_priv)
USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
0x0, 0x0, buffer, transfer_size, 1000);
if (retval < 0) {
- pr_err("%s: usb_control_msg request 0x%x returned %i\n",
- __FILE__, NI_USB_HS_PLUS_0x48_REQUEST, retval);
+ dev_err(&usb_dev->dev, "%s: usb_control_msg request 0x%x returned %i\n",
+ __func__, NI_USB_HS_PLUS_0x48_REQUEST, retval);
break;
}
// expected response data: 48 f3 30 00 00 00 00 00 00 00 00 00 00 00 00 00
if (buffer[0] != NI_USB_HS_PLUS_0x48_REQUEST)
- pr_err("%s: unexpected data: buffer[0]=0x%x, expected 0x%x\n",
- __func__, (int)buffer[0], NI_USB_HS_PLUS_0x48_REQUEST);
+ dev_err(&usb_dev->dev, "%s: unexpected data: buffer[0]=0x%x, expected 0x%x\n",
+ __func__, (int)buffer[0], NI_USB_HS_PLUS_0x48_REQUEST);
transfer_size = 2;
@@ -2117,14 +2147,14 @@ static int ni_usb_hs_plus_extra_init(struct ni_usb_priv *ni_priv)
USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
0x1, 0x0, buffer, transfer_size, 1000);
if (retval < 0) {
- pr_err("%s: usb_control_msg request 0x%x returned %i\n",
- __FILE__, NI_USB_HS_PLUS_LED_REQUEST, retval);
+ dev_err(&usb_dev->dev, "%s: usb_control_msg request 0x%x returned %i\n",
+ __func__, NI_USB_HS_PLUS_LED_REQUEST, retval);
break;
}
// expected response data: 4b 00
if (buffer[0] != NI_USB_HS_PLUS_LED_REQUEST)
- pr_err("%s: unexpected data: buffer[0]=0x%x, expected 0x%x\n",
- __func__, (int)buffer[0], NI_USB_HS_PLUS_LED_REQUEST);
+ dev_err(&usb_dev->dev, "%s: unexpected data: buffer[0]=0x%x, expected 0x%x\n",
+ __func__, (int)buffer[0], NI_USB_HS_PLUS_LED_REQUEST);
transfer_size = 9;
@@ -2133,14 +2163,14 @@ static int ni_usb_hs_plus_extra_init(struct ni_usb_priv *ni_priv)
USB_RECIP_INTERFACE,
0x0, 0x1, buffer, transfer_size, 1000);
if (retval < 0) {
- pr_err("%s: usb_control_msg request 0x%x returned %i\n",
- __func__, NI_USB_HS_PLUS_0xf8_REQUEST, retval);
+ dev_err(&usb_dev->dev, "%s: usb_control_msg request 0x%x returned %i\n",
+ __func__, NI_USB_HS_PLUS_0xf8_REQUEST, retval);
break;
}
// expected response data: f8 01 00 00 00 01 00 00 00
if (buffer[0] != NI_USB_HS_PLUS_0xf8_REQUEST)
- pr_err("%s: unexpected data: buffer[0]=0x%x, expected 0x%x\n",
- __func__, (int)buffer[0], NI_USB_HS_PLUS_0xf8_REQUEST);
+ dev_err(&usb_dev->dev, "%s: unexpected data: buffer[0]=0x%x, expected 0x%x\n",
+ __func__, (int)buffer[0], NI_USB_HS_PLUS_0xf8_REQUEST);
} while (0);
@@ -2191,9 +2221,9 @@ static int ni_usb_attach(gpib_board_t *board, const gpib_board_config_t *config)
return -ENODEV;
}
if (usb_reset_configuration(interface_to_usbdev(ni_priv->bus_interface)))
- pr_err("ni_usb_gpib: usb_reset_configuration() failed.\n");
+ dev_err(&usb_dev->dev, "ni_usb_gpib: usb_reset_configuration() failed.\n");
- product_id = le16_to_cpu(interface_to_usbdev(ni_priv->bus_interface)->descriptor.idProduct);
+ product_id = le16_to_cpu(usb_dev->descriptor.idProduct);
ni_priv->product_id = product_id;
timer_setup(&ni_priv->bulk_timer, ni_usb_timeout_handler, 0);
@@ -2234,7 +2264,8 @@ static int ni_usb_attach(gpib_board_t *board, const gpib_board_config_t *config)
break;
default:
mutex_unlock(&ni_usb_hotplug_lock);
- pr_err("\tDriver bug: unknown endpoints for usb device id\n");
+ dev_err(&usb_dev->dev, "\tDriver bug: unknown endpoints for usb device id %x\n",
+ product_id);
return -EINVAL;
}
@@ -2263,12 +2294,13 @@ static int ni_usb_attach(gpib_board_t *board, const gpib_board_config_t *config)
}
mutex_unlock(&ni_usb_hotplug_lock);
- pr_info("%s: attached\n", __func__);
+ dev_info(&usb_dev->dev, "%s: attached\n", __func__);
return retval;
}
static int ni_usb_shutdown_hardware(struct ni_usb_priv *ni_priv)
{
+ struct usb_device *usb_dev = interface_to_usbdev(ni_priv->bus_interface);
int retval;
int i = 0;
struct ni_usb_register writes[2];
@@ -2285,12 +2317,12 @@ static int ni_usb_shutdown_hardware(struct ni_usb_priv *ni_priv)
writes[i].value = 0x0;
i++;
if (i > writes_length) {
- pr_err("%s: bug!, buffer overrun, i=%i\n", __func__, i);
+ dev_err(&usb_dev->dev, "%s: bug!, buffer overrun, i=%i\n", __func__, i);
return -EINVAL;
}
retval = ni_usb_write_registers(ni_priv, writes, i, &ibsta);
if (retval) {
- pr_err("%s: register write failed, retval=%i\n", __func__, retval);
+ dev_err(&usb_dev->dev, "%s: register write failed, retval=%i\n", __func__, retval);
return retval;
}
return 0;
@@ -2362,35 +2394,34 @@ MODULE_DEVICE_TABLE(usb, ni_usb_driver_device_table);
static int ni_usb_driver_probe(struct usb_interface *interface, const struct usb_device_id *id)
{
+ struct usb_device *usb_dev = interface_to_usbdev(interface);
int i;
char *path;
static const int path_length = 1024;
-// printk("ni_usb_driver_probe\n");
mutex_lock(&ni_usb_hotplug_lock);
- usb_get_dev(interface_to_usbdev(interface));
+ usb_get_dev(usb_dev);
for (i = 0; i < MAX_NUM_NI_USB_INTERFACES; i++) {
if (!ni_usb_driver_interfaces[i]) {
ni_usb_driver_interfaces[i] = interface;
usb_set_intfdata(interface, NULL);
-// printk("set bus interface %i to address 0x%p\n", i, interface);
break;
}
}
if (i == MAX_NUM_NI_USB_INTERFACES) {
- usb_put_dev(interface_to_usbdev(interface));
+ usb_put_dev(usb_dev);
mutex_unlock(&ni_usb_hotplug_lock);
- pr_err("ni_usb_gpib: out of space in ni_usb_driver_interfaces[]\n");
+ dev_err(&usb_dev->dev, "%s: ni_usb_driver_interfaces[] full\n", __func__);
return -1;
}
path = kmalloc(path_length, GFP_KERNEL);
if (!path) {
- usb_put_dev(interface_to_usbdev(interface));
+ usb_put_dev(usb_dev);
mutex_unlock(&ni_usb_hotplug_lock);
return -ENOMEM;
}
- usb_make_path(interface_to_usbdev(interface), path, path_length);
- pr_info("ni_usb_gpib: probe succeeded for path: %s\n", path);
+ usb_make_path(usb_dev, path, path_length);
+ dev_info(&usb_dev->dev, "ni_usb_gpib: probe succeeded for path: %s\n", path);
kfree(path);
mutex_unlock(&ni_usb_hotplug_lock);
return 0;
@@ -2398,6 +2429,7 @@ static int ni_usb_driver_probe(struct usb_interface *interface, const struct usb
static void ni_usb_driver_disconnect(struct usb_interface *interface)
{
+ struct usb_device *usb_dev = interface_to_usbdev(interface);
int i;
mutex_lock(&ni_usb_hotplug_lock);
@@ -2424,14 +2456,15 @@ static void ni_usb_driver_disconnect(struct usb_interface *interface)
}
}
if (i == MAX_NUM_NI_USB_INTERFACES)
- pr_err("unable to find interface in ni_usb_driver_interfaces[]? bug?\n");
- usb_put_dev(interface_to_usbdev(interface));
+ dev_err(&usb_dev->dev, "%s: unable to find interface in ni_usb_driver_interfaces[]? bug?\n",
+ __func__);
+ usb_put_dev(usb_dev);
mutex_unlock(&ni_usb_hotplug_lock);
}
static int ni_usb_driver_suspend(struct usb_interface *interface, pm_message_t message)
{
- struct usb_device *usb_dev;
+ struct usb_device *usb_dev = interface_to_usbdev(interface);
gpib_board_t *board;
int i, retval;
@@ -2463,7 +2496,6 @@ static int ni_usb_driver_suspend(struct usb_interface *interface, pm_message_t m
ni_usb_cleanup_urbs(ni_priv);
mutex_unlock(&ni_priv->interrupt_transfer_lock);
}
- usb_dev = interface_to_usbdev(ni_priv->bus_interface);
dev_info(&usb_dev->dev,
"bus %d dev num %d gpib minor %d, ni usb interface %i suspended\n",
usb_dev->bus->busnum, usb_dev->devnum, board->minor, i);
@@ -2475,7 +2507,8 @@ static int ni_usb_driver_suspend(struct usb_interface *interface, pm_message_t m
static int ni_usb_driver_resume(struct usb_interface *interface)
{
- struct usb_device *usb_dev;
+ struct usb_device *usb_dev = interface_to_usbdev(interface);
+
gpib_board_t *board;
int i, retval;
@@ -2500,15 +2533,15 @@ static int ni_usb_driver_resume(struct usb_interface *interface)
mutex_lock(&ni_priv->interrupt_transfer_lock);
retval = usb_submit_urb(ni_priv->interrupt_urb, GFP_KERNEL);
if (retval) {
- pr_err("%s: failed to resubmit interrupt urb, retval=%i\n",
- __func__, retval);
+ dev_err(&usb_dev->dev, "%s: failed to resubmit interrupt urb, retval=%i\n",
+ __func__, retval);
mutex_unlock(&ni_priv->interrupt_transfer_lock);
mutex_unlock(&ni_usb_hotplug_lock);
return retval;
}
mutex_unlock(&ni_priv->interrupt_transfer_lock);
} else {
- pr_err("%s: bug! int urb not set up\n", __func__);
+ dev_err(&usb_dev->dev, "%s: bug! int urb not set up\n", __func__);
mutex_unlock(&ni_usb_hotplug_lock);
return -EINVAL;
}
@@ -2540,7 +2573,7 @@ static int ni_usb_driver_resume(struct usb_interface *interface)
break;
default:
mutex_unlock(&ni_usb_hotplug_lock);
- pr_err("\tDriver bug: unknown endpoints for usb device id\n");
+ dev_err(&usb_dev->dev, "\tDriver bug: unknown endpoints for usb device id\n");
return -EINVAL;
}
@@ -2565,7 +2598,6 @@ static int ni_usb_driver_resume(struct usb_interface *interface)
if (ni_priv->ren_state)
ni_usb_remote_enable(board, 1);
- usb_dev = interface_to_usbdev(ni_priv->bus_interface);
dev_info(&usb_dev->dev,
"bus %d dev num %d gpib minor %d, ni usb interface %i resumed\n",
usb_dev->bus->busnum, usb_dev->devnum, board->minor, i);
--
2.46.2
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 04/11] staging: gpib: Update messaging and usb_device refs in agilent_usb
2024-11-03 21:26 [PATCH v2 00/11] staging: gpib: Patch set for gpib staging drivers Dave Penkler
` (2 preceding siblings ...)
2024-11-03 21:26 ` [PATCH 03/11] staging: gpib: Update messaging and usb_device refs in ni_usb Dave Penkler
@ 2024-11-03 21:26 ` Dave Penkler
2024-11-04 8:42 ` Dan Carpenter
2024-11-03 21:26 ` [PATCH 05/11] staging: gpib: Remove GPIB_DEBUG reference and update messaging Dave Penkler
` (6 subsequent siblings)
10 siblings, 1 reply; 16+ messages in thread
From: Dave Penkler @ 2024-11-03 21:26 UTC (permalink / raw)
To: gregkh, linux-staging, linux-kernel
Cc: skhan, arnd, dan.carpenter, Dave Penkler
Replace GPIB_DPRINTK with dev_dbg
Replace pr_xxx with dev_xxx wherever possible
Use previously initialized usb_device pointer for usb_put_dev()
Signed-off-by: Dave Penkler <dpenkler@gmail.com>
---
.../gpib/agilent_82357a/agilent_82357a.c | 266 ++++++++++--------
1 file changed, 156 insertions(+), 110 deletions(-)
diff --git a/drivers/staging/gpib/agilent_82357a/agilent_82357a.c b/drivers/staging/gpib/agilent_82357a/agilent_82357a.c
index 748aadc5cebc..68b40831b9ad 100644
--- a/drivers/staging/gpib/agilent_82357a/agilent_82357a.c
+++ b/drivers/staging/gpib/agilent_82357a/agilent_82357a.c
@@ -15,11 +15,11 @@
#include "tms9914.h"
MODULE_LICENSE("GPL");
-MODULE_DESCRIPTION("GPIB driver for Agilent 82357A/B usb adapter");
+MODULE_DESCRIPTION("GPIB driver for Agilent 82357A/B usb adapters");
#define MAX_NUM_82357A_INTERFACES 128
static struct usb_interface *agilent_82357a_driver_interfaces[MAX_NUM_82357A_INTERFACES];
-DEFINE_MUTEX(agilent_82357a_hotplug_lock);
+DEFINE_MUTEX(agilent_82357a_hotplug_lock); // protect board insertion and removal
static unsigned int agilent_82357a_update_status(gpib_board_t *board, unsigned int clear_mask);
@@ -29,9 +29,6 @@ static void agilent_82357a_bulk_complete(struct urb *urb)
{
struct agilent_82357a_urb_ctx *context = urb->context;
-// printk("debug: %s: status=0x%x, error_count=%i, actual_length=%i\n", __func__,
-// urb->status, urb->error_count, urb->actual_length);
-
up(&context->complete);
}
@@ -80,16 +77,17 @@ static int agilent_82357a_send_bulk_msg(struct agilent_82357a_priv *a_priv, void
if (timeout_msecs)
mod_timer(&a_priv->bulk_timer, jiffies + msecs_to_jiffies(timeout_msecs));
- //printk("%s: submitting urb\n", __func__);
+ //dev_dbg(&usb_dev->dev, "%s: submitting urb\n", __func__);
retval = usb_submit_urb(a_priv->bulk_urb, GFP_KERNEL);
if (retval) {
- pr_err("%s: failed to submit bulk out urb, retval=%i\n", __func__, retval);
+ dev_err(&usb_dev->dev, "%s: failed to submit bulk out urb, retval=%i\n",
+ __func__, retval);
mutex_unlock(&a_priv->bulk_alloc_lock);
goto cleanup;
}
mutex_unlock(&a_priv->bulk_alloc_lock);
if (down_interruptible(&context->complete)) {
- pr_err("%s: interrupted\n", __func__);
+ dev_err(&usb_dev->dev, "%s: interrupted\n", __func__);
retval = -ERESTARTSYS;
goto cleanup;
}
@@ -150,16 +148,17 @@ static int agilent_82357a_receive_bulk_msg(struct agilent_82357a_priv *a_priv, v
if (timeout_msecs)
mod_timer(&a_priv->bulk_timer, jiffies + msecs_to_jiffies(timeout_msecs));
- //printk("%s: submitting urb\n", __func__);
+ //dev_dbg(&usb_dev->dev, "%s: submitting urb\n", __func__);
retval = usb_submit_urb(a_priv->bulk_urb, GFP_KERNEL);
if (retval) {
- pr_err("%s: failed to submit bulk out urb, retval=%i\n", __func__, retval);
+ dev_err(&usb_dev->dev, "%s: failed to submit bulk out urb, retval=%i\n",
+ __func__, retval);
mutex_unlock(&a_priv->bulk_alloc_lock);
goto cleanup;
}
mutex_unlock(&a_priv->bulk_alloc_lock);
if (down_interruptible(&context->complete)) {
- pr_err("%s: interrupted\n", __func__);
+ dev_err(&usb_dev->dev, "%s: interrupted\n", __func__);
retval = -ERESTARTSYS;
goto cleanup;
}
@@ -216,6 +215,7 @@ static int agilent_82357a_write_registers(struct agilent_82357a_priv *a_priv,
const struct agilent_82357a_register_pairlet *writes,
int num_writes)
{
+ struct usb_device *usb_dev = interface_to_usbdev(a_priv->bus_interface);
int retval;
u8 *out_data, *in_data;
int out_data_length, in_data_length;
@@ -227,13 +227,13 @@ static int agilent_82357a_write_registers(struct agilent_82357a_priv *a_priv,
static const int max_writes = 31;
if (num_writes > max_writes) {
- pr_err("%s: bug! num_writes=%i too large\n", __func__, num_writes);
+ dev_err(&usb_dev->dev, "%s: bug! num_writes=%i too large\n", __func__, num_writes);
return -EIO;
}
out_data_length = num_writes * bytes_per_write + header_length;
out_data = kmalloc(out_data_length, GFP_KERNEL);
if (!out_data) {
- pr_err("%s: kmalloc failed\n", __func__);
+ dev_err(&usb_dev->dev, "%s: kmalloc failed\n", __func__);
return -ENOMEM;
}
out_data[i++] = DATA_PIPE_CMD_WR_REGS;
@@ -243,7 +243,7 @@ static int agilent_82357a_write_registers(struct agilent_82357a_priv *a_priv,
out_data[i++] = writes[j].value;
}
if (i > out_data_length)
- pr_err("%s: bug! buffer overrun\n", __func__);
+ dev_err(&usb_dev->dev, "%s: bug! buffer overrun\n", __func__);
retval = mutex_lock_interruptible(&a_priv->bulk_transfer_lock);
if (retval) {
kfree(out_data);
@@ -252,15 +252,15 @@ static int agilent_82357a_write_registers(struct agilent_82357a_priv *a_priv,
retval = agilent_82357a_send_bulk_msg(a_priv, out_data, i, &bytes_written, 1000);
kfree(out_data);
if (retval) {
- pr_err("%s: agilent_82357a_send_bulk_msg returned %i, bytes_written=%i, i=%i\n",
- __func__, retval, bytes_written, i);
+ dev_err(&usb_dev->dev, "%s: agilent_82357a_send_bulk_msg returned %i, bytes_written=%i, i=%i\n",
+ __func__, retval, bytes_written, i);
mutex_unlock(&a_priv->bulk_transfer_lock);
return retval;
}
in_data_length = 0x20;
in_data = kmalloc(in_data_length, GFP_KERNEL);
if (!in_data) {
- pr_err("%s: kmalloc failed\n", __func__);
+ dev_err(&usb_dev->dev, "%s: kmalloc failed\n", __func__);
mutex_unlock(&a_priv->bulk_transfer_lock);
return -ENOMEM;
}
@@ -269,20 +269,20 @@ static int agilent_82357a_write_registers(struct agilent_82357a_priv *a_priv,
mutex_unlock(&a_priv->bulk_transfer_lock);
if (retval) {
- pr_err("%s: agilent_82357a_receive_bulk_msg returned %i, bytes_read=%i\n",
- __func__, retval, bytes_read);
+ dev_err(&usb_dev->dev, "%s: agilent_82357a_receive_bulk_msg returned %i, bytes_read=%i\n",
+ __func__, retval, bytes_read);
agilent_82357a_dump_raw_block(in_data, bytes_read);
kfree(in_data);
return -EIO;
}
if (in_data[0] != (0xff & ~DATA_PIPE_CMD_WR_REGS)) {
- pr_err("%s: error, bulk command=0x%x != ~DATA_PIPE_CMD_WR_REGS\n",
- __func__, in_data[0]);
+ dev_err(&usb_dev->dev, "%s: error, bulk command=0x%x != ~DATA_PIPE_CMD_WR_REGS\n",
+ __func__, in_data[0]);
return -EIO;
}
if (in_data[1]) {
- pr_err("%s: nonzero error code 0x%x in DATA_PIPE_CMD_WR_REGS response\n",
- __func__, in_data[1]);
+ dev_err(&usb_dev->dev, "%s: nonzero error code 0x%x in DATA_PIPE_CMD_WR_REGS response\n",
+ __func__, in_data[1]);
return -EIO;
}
kfree(in_data);
@@ -293,6 +293,7 @@ static int agilent_82357a_read_registers(struct agilent_82357a_priv *a_priv,
struct agilent_82357a_register_pairlet *reads,
int num_reads, int blocking)
{
+ struct usb_device *usb_dev = interface_to_usbdev(a_priv->bus_interface);
int retval;
u8 *out_data, *in_data;
int out_data_length, in_data_length;
@@ -303,12 +304,12 @@ static int agilent_82357a_read_registers(struct agilent_82357a_priv *a_priv,
static const int max_reads = 62;
if (num_reads > max_reads)
- pr_err("%s: bug! num_reads=%i too large\n", __func__, num_reads);
+ dev_err(&usb_dev->dev, "%s: bug! num_reads=%i too large\n", __func__, num_reads);
out_data_length = num_reads + header_length;
out_data = kmalloc(out_data_length, GFP_KERNEL);
if (!out_data) {
- pr_err("%s: kmalloc failed\n", __func__);
+ dev_err(&usb_dev->dev, "%s: kmalloc failed\n", __func__);
return -ENOMEM;
}
out_data[i++] = DATA_PIPE_CMD_RD_REGS;
@@ -316,7 +317,7 @@ static int agilent_82357a_read_registers(struct agilent_82357a_priv *a_priv,
for (j = 0; j < num_reads; j++)
out_data[i++] = reads[j].address;
if (i > out_data_length)
- pr_err("%s: bug! buffer overrun\n", __func__);
+ dev_err(&usb_dev->dev, "%s: bug! buffer overrun\n", __func__);
if (blocking) {
retval = mutex_lock_interruptible(&a_priv->bulk_transfer_lock);
if (retval) {
@@ -333,15 +334,15 @@ static int agilent_82357a_read_registers(struct agilent_82357a_priv *a_priv,
retval = agilent_82357a_send_bulk_msg(a_priv, out_data, i, &bytes_written, 1000);
kfree(out_data);
if (retval) {
- pr_err("%s: agilent_82357a_send_bulk_msg returned %i, bytes_written=%i, i=%i\n",
- __func__, retval, bytes_written, i);
+ dev_err(&usb_dev->dev, "%s: agilent_82357a_send_bulk_msg returned %i, bytes_written=%i, i=%i\n",
+ __func__, retval, bytes_written, i);
mutex_unlock(&a_priv->bulk_transfer_lock);
return retval;
}
in_data_length = 0x20;
in_data = kmalloc(in_data_length, GFP_KERNEL);
if (!in_data) {
- pr_err("%s: kmalloc failed\n", __func__);
+ dev_err(&usb_dev->dev, "%s: kmalloc failed\n", __func__);
mutex_unlock(&a_priv->bulk_transfer_lock);
return -ENOMEM;
}
@@ -350,21 +351,21 @@ static int agilent_82357a_read_registers(struct agilent_82357a_priv *a_priv,
mutex_unlock(&a_priv->bulk_transfer_lock);
if (retval) {
- pr_err("%s: agilent_82357a_receive_bulk_msg returned %i, bytes_read=%i\n",
- __func__, retval, bytes_read);
+ dev_err(&usb_dev->dev, "%s: agilent_82357a_receive_bulk_msg returned %i, bytes_read=%i\n",
+ __func__, retval, bytes_read);
agilent_82357a_dump_raw_block(in_data, bytes_read);
kfree(in_data);
return -EIO;
}
i = 0;
if (in_data[i++] != (0xff & ~DATA_PIPE_CMD_RD_REGS)) {
- pr_err("%s: error, bulk command=0x%x != ~DATA_PIPE_CMD_RD_REGS\n",
- __func__, in_data[0]);
+ dev_err(&usb_dev->dev, "%s: error, bulk command=0x%x != ~DATA_PIPE_CMD_RD_REGS\n",
+ __func__, in_data[0]);
return -EIO;
}
if (in_data[i++]) {
- pr_err("%s: nonzero error code 0x%x in DATA_PIPE_CMD_RD_REGS response\n",
- __func__, in_data[1]);
+ dev_err(&usb_dev->dev, "%s: nonzero error code 0x%x in DATA_PIPE_CMD_RD_REGS response\n",
+ __func__, in_data[1]);
return -EIO;
}
for (j = 0; j < num_reads; j++)
@@ -375,6 +376,7 @@ static int agilent_82357a_read_registers(struct agilent_82357a_priv *a_priv,
static int agilent_82357a_abort(struct agilent_82357a_priv *a_priv, int flush)
{
+ struct usb_device *usb_dev = interface_to_usbdev(a_priv->bus_interface);
int retval = 0;
int receive_control_retval;
u16 wIndex = 0;
@@ -394,13 +396,14 @@ static int agilent_82357a_abort(struct agilent_82357a_priv *a_priv, int flush)
wIndex, status_data,
status_data_len, 100);
if (receive_control_retval < 0) {
- pr_err("%s: agilent_82357a_receive_control_msg() returned %i\n",
- __func__, receive_control_retval);
+ dev_err(&usb_dev->dev, "%s: agilent_82357a_receive_control_msg() returned %i\n",
+ __func__, receive_control_retval);
retval = -EIO;
goto cleanup;
}
if (status_data[0] != (~XFER_ABORT & 0xff)) {
- pr_err("%s: error, major code=0x%x != ~XFER_ABORT\n", __func__, status_data[0]);
+ dev_err(&usb_dev->dev, "%s: error, major code=0x%x != ~XFER_ABORT\n",
+ __func__, status_data[0]);
retval = -EIO;
goto cleanup;
}
@@ -416,7 +419,8 @@ static int agilent_82357a_abort(struct agilent_82357a_priv *a_priv, int flush)
fallthrough;
case UGP_ERR_FLUSHING_ALREADY:
default:
- pr_err("%s: abort returned error code=0x%x\n", __func__, status_data[1]);
+ dev_err(&usb_dev->dev, "%s: abort returned error code=0x%x\n",
+ __func__, status_data[1]);
retval = -EIO;
break;
}
@@ -435,6 +439,7 @@ static int agilent_82357a_read(gpib_board_t *board, uint8_t *buffer, size_t leng
{
int retval;
struct agilent_82357a_priv *a_priv = board->private_data;
+ struct usb_device *usb_dev = interface_to_usbdev(a_priv->bus_interface);
u8 *out_data, *in_data;
int out_data_length, in_data_length;
int bytes_written, bytes_read;
@@ -470,8 +475,8 @@ static int agilent_82357a_read(gpib_board_t *board, uint8_t *buffer, size_t leng
retval = agilent_82357a_send_bulk_msg(a_priv, out_data, i, &bytes_written, msec_timeout);
kfree(out_data);
if (retval || bytes_written != i) {
- pr_err("%s: agilent_82357a_send_bulk_msg returned %i, bytes_written=%i, i=%i\n",
- __func__, retval, bytes_written, i);
+ dev_err(&usb_dev->dev, "%s: agilent_82357a_send_bulk_msg returned %i, bytes_written=%i, i=%i\n",
+ __func__, retval, bytes_written, i);
mutex_unlock(&a_priv->bulk_transfer_lock);
if (retval < 0)
return retval;
@@ -500,18 +505,18 @@ static int agilent_82357a_read(gpib_board_t *board, uint8_t *buffer, size_t leng
extra_bytes_retval = agilent_82357a_receive_bulk_msg(a_priv, in_data + bytes_read,
in_data_length - bytes_read,
&extra_bytes_read, 100);
- //printk("%s: agilent_82357a_receive_bulk_msg timed out, bytes_read=%i,
- // extra_bytes_read=%i\n",
- // __func__, bytes_read, extra_bytes_read);
+ //dev_err(&usb_dev->dev, "%s: agilent_82357a_receive_bulk_msg timed out,
+ // bytes_read=%i, extra_bytes_read=%i\n",
+ // __func__, bytes_read, extra_bytes_read);
bytes_read += extra_bytes_read;
if (extra_bytes_retval) {
- pr_err("%s: extra_bytes_retval=%i, bytes_read=%i\n", __func__,
- extra_bytes_retval, bytes_read);
+ dev_err(&usb_dev->dev, "%s: extra_bytes_retval=%i, bytes_read=%i\n",
+ __func__, extra_bytes_retval, bytes_read);
agilent_82357a_abort(a_priv, 0);
}
} else if (retval) {
- pr_err("%s: agilent_82357a_receive_bulk_msg returned %i, bytes_read=%i\n",
- __func__, retval, bytes_read);
+ dev_err(&usb_dev->dev, "%s: agilent_82357a_receive_bulk_msg returned %i, bytes_read=%i\n",
+ __func__, retval, bytes_read);
agilent_82357a_abort(a_priv, 0);
}
mutex_unlock(&a_priv->bulk_transfer_lock);
@@ -519,7 +524,7 @@ static int agilent_82357a_read(gpib_board_t *board, uint8_t *buffer, size_t leng
bytes_read = length + 1;
pr_warn("%s: bytes_read > length? truncating", __func__);
}
- //printk("%s: received response:\n", __func__);
+ //dev_dbg(&usb_dev->dev, "%s: received response:\n", __func__);
// agilent_82357a_dump_raw_block(in_data, bytes_read);
if (bytes_read >= 1) {
memcpy(buffer, in_data, bytes_read - 1);
@@ -545,6 +550,7 @@ static ssize_t agilent_82357a_generic_write(gpib_board_t *board, uint8_t *buffer
{
int retval;
struct agilent_82357a_priv *a_priv = board->private_data;
+ struct usb_device *usb_dev = interface_to_usbdev(a_priv->bus_interface);
u8 *out_data = NULL;
u8 *status_data = NULL;
int out_data_length;
@@ -574,7 +580,8 @@ static ssize_t agilent_82357a_generic_write(gpib_board_t *board, uint8_t *buffer
out_data[i++] = (length >> 24) & 0xff;
for (j = 0; j < length; j++)
out_data[i++] = buffer[j];
- //printk("%s: sending bulk msg(), send_commands=%i\n", __func__, send_commands);
+ //dev_dbg(&usb_dev->dev, "%s: sending bulk msg(), send_commands=%i\n",
+ //__func__, send_commands);
clear_bit(AIF_WRITE_COMPLETE_BN, &a_priv->interrupt_flags);
@@ -589,28 +596,28 @@ static ssize_t agilent_82357a_generic_write(gpib_board_t *board, uint8_t *buffer
kfree(out_data);
if (retval || raw_bytes_written != i) {
agilent_82357a_abort(a_priv, 0);
- pr_err("%s: agilent_82357a_send_bulk_msg returned %i, raw_bytes_written=%i, i=%i\n",
- __func__, retval, raw_bytes_written, i);
+ dev_err(&usb_dev->dev, "%s: agilent_82357a_send_bulk_msg returned %i, raw_bytes_written=%i, i=%i\n",
+ __func__, retval, raw_bytes_written, i);
mutex_unlock(&a_priv->bulk_transfer_lock);
if (retval < 0)
return retval;
return -EIO;
}
- //printk("%s: waiting for write complete\n", __func__);
+ //dev_dbg(&usb_dev->dev, "%s: waiting for write complete\n", __func__);
retval = wait_event_interruptible(board->wait,
test_bit(AIF_WRITE_COMPLETE_BN,
&a_priv->interrupt_flags) ||
test_bit(TIMO_NUM, &board->status));
if (retval) {
- pr_err("%s: wait write complete interrupted\n", __func__);
+ dev_err(&usb_dev->dev, "%s: wait write complete interrupted\n", __func__);
agilent_82357a_abort(a_priv, 0);
mutex_unlock(&a_priv->bulk_transfer_lock);
return -ERESTARTSYS;
}
if (test_bit(AIF_WRITE_COMPLETE_BN, &a_priv->interrupt_flags) == 0) {
- GPIB_DPRINTK("%s: write timed out ibs %i, tmo %i\n", __func__,
- test_bit(TIMO_NUM, &board->status), msec_timeout);
+ dev_dbg(&usb_dev->dev, "write timed out ibs %i, tmo %i\n",
+ test_bit(TIMO_NUM, &board->status), msec_timeout);
agilent_82357a_abort(a_priv, 0);
@@ -619,16 +626,17 @@ static ssize_t agilent_82357a_generic_write(gpib_board_t *board, uint8_t *buffer
read_reg.address = BSR;
retval = agilent_82357a_read_registers(a_priv, &read_reg, 1, 1);
if (retval) {
- pr_err("%s: agilent_82357a_read_registers() returned error\n", __func__);
+ dev_err(&usb_dev->dev, "%s: agilent_82357a_read_registers() returned error\n",
+ __func__);
return -ETIMEDOUT;
}
bsr = read_reg.value;
- GPIB_DPRINTK("%s: write aborted bsr 0x%hx\n", __func__, bsr);
+ dev_dbg(&usb_dev->dev, "write aborted bsr 0x%x\n", bsr);
if (send_commands) {/* check for no listeners */
if ((bsr & BSR_ATN_BIT) && !(bsr & (BSR_NDAC_BIT | BSR_NRFD_BIT))) {
- GPIB_DPRINTK("%s: No listener on command\n", __func__);
+ dev_dbg(&usb_dev->dev, "No listener on command\n");
clear_bit(TIMO_NUM, &board->status);
return -ENOTCONN; // no listener on bus
}
@@ -636,13 +644,13 @@ static ssize_t agilent_82357a_generic_write(gpib_board_t *board, uint8_t *buffer
read_reg.address = ADSR;
retval = agilent_82357a_read_registers(a_priv, &read_reg, 1, 1);
if (retval) {
- pr_err("%s: agilent_82357a_read_registers() returned error\n",
- __func__);
+ dev_err(&usb_dev->dev, "%s: agilent_82357a_read_registers() returned error\n",
+ __func__);
return -ETIMEDOUT;
}
adsr = read_reg.value;
if ((adsr & HR_TA) && !(bsr & (BSR_NDAC_BIT | BSR_NRFD_BIT))) {
- GPIB_DPRINTK("%s: No listener on write\n", __func__);
+ dev_dbg(&usb_dev->dev, "No listener on write\n");
clear_bit(TIMO_NUM, &board->status);
return -ECOMM;
}
@@ -657,14 +665,15 @@ static ssize_t agilent_82357a_generic_write(gpib_board_t *board, uint8_t *buffer
return -ENOMEM;
}
- // printk("%s: receiving control msg\n", __func__);
+ // dev_dbg(&usb_dev->dev, "%s: receiving control msg\n", __func__);
retval = agilent_82357a_receive_control_msg(a_priv, agilent_82357a_control_request,
USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE,
XFER_STATUS, 0, status_data, STATUS_DATA_LEN,
100);
mutex_unlock(&a_priv->bulk_transfer_lock);
if (retval < 0) {
- pr_err("%s: agilent_82357a_receive_control_msg() returned %i\n", __func__, retval);
+ dev_err(&usb_dev->dev, "%s: agilent_82357a_receive_control_msg() returned %i\n",
+ __func__, retval);
kfree(status_data);
return -EIO;
}
@@ -674,7 +683,8 @@ static ssize_t agilent_82357a_generic_write(gpib_board_t *board, uint8_t *buffer
*bytes_written |= status_data[5] << 24;
kfree(status_data);
- //printk("%s: write completed, bytes_written=%i\n", __func__, (int)*bytes_written);
+ //dev_dbg(&usb_dev->dev, "%s: write completed, bytes_written=%i\n",
+ //__func__, (int)*bytes_written);
return 0;
}
@@ -693,6 +703,7 @@ int agilent_82357a_command(gpib_board_t *board, uint8_t *buffer, size_t length,
int agilent_82357a_take_control_internal(gpib_board_t *board, int synchronous)
{
struct agilent_82357a_priv *a_priv = board->private_data;
+ struct usb_device *usb_dev = interface_to_usbdev(a_priv->bus_interface);
struct agilent_82357a_register_pairlet write;
int retval;
@@ -703,7 +714,8 @@ int agilent_82357a_take_control_internal(gpib_board_t *board, int synchronous)
write.value = AUX_TCA;
retval = agilent_82357a_write_registers(a_priv, &write, 1);
if (retval)
- pr_err("%s: agilent_82357a_write_registers() returned error\n", __func__);
+ dev_err(&usb_dev->dev, "%s: agilent_82357a_write_registers() returned error\n",
+ __func__);
return retval;
}
@@ -736,6 +748,7 @@ static int agilent_82357a_take_control(gpib_board_t *board, int synchronous)
static int agilent_82357a_go_to_standby(gpib_board_t *board)
{
struct agilent_82357a_priv *a_priv = board->private_data;
+ struct usb_device *usb_dev = interface_to_usbdev(a_priv->bus_interface);
struct agilent_82357a_register_pairlet write;
int retval;
@@ -743,7 +756,8 @@ static int agilent_82357a_go_to_standby(gpib_board_t *board)
write.value = AUX_GTS;
retval = agilent_82357a_write_registers(a_priv, &write, 1);
if (retval)
- pr_err("%s: agilent_82357a_write_registers() returned error\n", __func__);
+ dev_err(&usb_dev->dev, "%s: agilent_82357a_write_registers() returned error\n",
+ __func__);
return 0;
}
@@ -751,6 +765,7 @@ static int agilent_82357a_go_to_standby(gpib_board_t *board)
static void agilent_82357a_request_system_control(gpib_board_t *board, int request_control)
{
struct agilent_82357a_priv *a_priv = board->private_data;
+ struct usb_device *usb_dev = interface_to_usbdev(a_priv->bus_interface);
struct agilent_82357a_register_pairlet writes[2];
int retval;
int i = 0;
@@ -771,13 +786,15 @@ static void agilent_82357a_request_system_control(gpib_board_t *board, int reque
++i;
retval = agilent_82357a_write_registers(a_priv, writes, i);
if (retval)
- pr_err("%s: agilent_82357a_write_registers() returned error\n", __func__);
+ dev_err(&usb_dev->dev, "%s: agilent_82357a_write_registers() returned error\n",
+ __func__);
return;// retval;
}
static void agilent_82357a_interface_clear(gpib_board_t *board, int assert)
{
struct agilent_82357a_priv *a_priv = board->private_data;
+ struct usb_device *usb_dev = interface_to_usbdev(a_priv->bus_interface);
struct agilent_82357a_register_pairlet write;
int retval;
@@ -789,12 +806,14 @@ static void agilent_82357a_interface_clear(gpib_board_t *board, int assert)
}
retval = agilent_82357a_write_registers(a_priv, &write, 1);
if (retval)
- pr_err("%s: agilent_82357a_write_registers() returned error\n", __func__);
+ dev_err(&usb_dev->dev, "%s: agilent_82357a_write_registers() returned error\n",
+ __func__);
}
static void agilent_82357a_remote_enable(gpib_board_t *board, int enable)
{
struct agilent_82357a_priv *a_priv = board->private_data;
+ struct usb_device *usb_dev = interface_to_usbdev(a_priv->bus_interface);
struct agilent_82357a_register_pairlet write;
int retval;
@@ -804,7 +823,8 @@ static void agilent_82357a_remote_enable(gpib_board_t *board, int enable)
write.value |= AUX_CS;
retval = agilent_82357a_write_registers(a_priv, &write, 1);
if (retval)
- pr_err("%s: agilent_82357a_write_registers() returned error\n", __func__);
+ dev_err(&usb_dev->dev, "%s: agilent_82357a_write_registers() returned error\n",
+ __func__);
a_priv->ren_state = enable;
return;// 0;
}
@@ -832,6 +852,7 @@ static void agilent_82357a_disable_eos(gpib_board_t *board)
static unsigned int agilent_82357a_update_status(gpib_board_t *board, unsigned int clear_mask)
{
struct agilent_82357a_priv *a_priv = board->private_data;
+ struct usb_device *usb_dev = interface_to_usbdev(a_priv->bus_interface);
struct agilent_82357a_register_pairlet address_status, bus_status;
int retval;
@@ -844,7 +865,8 @@ static unsigned int agilent_82357a_update_status(gpib_board_t *board, unsigned i
retval = agilent_82357a_read_registers(a_priv, &address_status, 1, 0);
if (retval) {
if (retval != -EAGAIN)
- pr_err("%s: agilent_82357a_read_registers() returned error\n", __func__);
+ dev_err(&usb_dev->dev, "%s: agilent_82357a_read_registers() returned error\n",
+ __func__);
return board->status;
}
// check for remote/local
@@ -876,7 +898,8 @@ static unsigned int agilent_82357a_update_status(gpib_board_t *board, unsigned i
retval = agilent_82357a_read_registers(a_priv, &bus_status, 1, 0);
if (retval) {
if (retval != -EAGAIN)
- pr_err("%s: agilent_82357a_read_registers() returned error\n", __func__);
+ dev_err(&usb_dev->dev, "%s: agilent_82357a_read_registers() returned error\n",
+ __func__);
return board->status;
}
if (bus_status.value & BSR_SRQ_BIT)
@@ -890,6 +913,7 @@ static unsigned int agilent_82357a_update_status(gpib_board_t *board, unsigned i
static int agilent_82357a_primary_address(gpib_board_t *board, unsigned int address)
{
struct agilent_82357a_priv *a_priv = board->private_data;
+ struct usb_device *usb_dev = interface_to_usbdev(a_priv->bus_interface);
struct agilent_82357a_register_pairlet write;
int retval;
@@ -898,7 +922,8 @@ static int agilent_82357a_primary_address(gpib_board_t *board, unsigned int addr
write.value = address & ADDRESS_MASK;
retval = agilent_82357a_write_registers(a_priv, &write, 1);
if (retval) {
- pr_err("%s: agilent_82357a_write_registers() returned error\n", __func__);
+ dev_err(&usb_dev->dev, "%s: agilent_82357a_write_registers() returned error\n",
+ __func__);
return retval;
}
return retval;
@@ -914,6 +939,7 @@ static int agilent_82357a_secondary_address(gpib_board_t *board, unsigned int ad
static int agilent_82357a_parallel_poll(gpib_board_t *board, uint8_t *result)
{
struct agilent_82357a_priv *a_priv = board->private_data;
+ struct usb_device *usb_dev = interface_to_usbdev(a_priv->bus_interface);
struct agilent_82357a_register_pairlet writes[2];
struct agilent_82357a_register_pairlet read;
int retval;
@@ -925,14 +951,16 @@ static int agilent_82357a_parallel_poll(gpib_board_t *board, uint8_t *result)
writes[1].value = a_priv->hw_control_bits & ~NOT_PARALLEL_POLL;
retval = agilent_82357a_write_registers(a_priv, writes, 2);
if (retval) {
- pr_err("%s: agilent_82357a_write_registers() returned error\n", __func__);
+ dev_err(&usb_dev->dev, "%s: agilent_82357a_write_registers() returned error\n",
+ __func__);
return retval;
}
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) {
- pr_err("%s: agilent_82357a_read_registers() returned error\n", __func__);
+ dev_err(&usb_dev->dev, "%s: agilent_82357a_read_registers() returned error\n",
+ __func__);
return retval;
}
*result = read.value;
@@ -943,7 +971,8 @@ static int agilent_82357a_parallel_poll(gpib_board_t *board, uint8_t *result)
writes[1].value = AUX_RPP;
retval = agilent_82357a_write_registers(a_priv, writes, 2);
if (retval) {
- pr_err("%s: agilent_82357a_write_registers() returned error\n", __func__);
+ dev_err(&usb_dev->dev, "%s: agilent_82357a_write_registers() returned error\n",
+ __func__);
return retval;
}
return 0;
@@ -982,6 +1011,7 @@ static void agilent_82357a_return_to_local(gpib_board_t *board)
static int agilent_82357a_line_status(const gpib_board_t *board)
{
struct agilent_82357a_priv *a_priv = board->private_data;
+ struct usb_device *usb_dev = interface_to_usbdev(a_priv->bus_interface);
struct agilent_82357a_register_pairlet bus_status;
int retval;
int status = ValidALL;
@@ -990,7 +1020,8 @@ static int agilent_82357a_line_status(const gpib_board_t *board)
retval = agilent_82357a_read_registers(a_priv, &bus_status, 1, 0);
if (retval) {
if (retval != -EAGAIN)
- pr_err("%s: agilent_82357a_read_registers() returned error\n", __func__);
+ dev_err(&usb_dev->dev, "%s: agilent_82357a_read_registers() returned error\n",
+ __func__);
return retval;
}
if (bus_status.value & BSR_REN_BIT)
@@ -1031,6 +1062,7 @@ static unsigned short nanosec_to_fast_talker_bits(unsigned int *nanosec)
static unsigned int agilent_82357a_t1_delay(gpib_board_t *board, unsigned int nanosec)
{
struct agilent_82357a_priv *a_priv = board->private_data;
+ struct usb_device *usb_dev = interface_to_usbdev(a_priv->bus_interface);
struct agilent_82357a_register_pairlet write;
int retval;
@@ -1038,7 +1070,8 @@ static unsigned int agilent_82357a_t1_delay(gpib_board_t *board, unsigned int na
write.value = nanosec_to_fast_talker_bits(&nanosec);
retval = agilent_82357a_write_registers(a_priv, &write, 1);
if (retval)
- pr_err("%s: agilent_82357a_write_registers() returned error\n", __func__);
+ dev_err(&usb_dev->dev, "%s: agilent_82357a_write_registers() returned error\n",
+ __func__);
return nanosec;
}
@@ -1046,6 +1079,7 @@ static void agilent_82357a_interrupt_complete(struct urb *urb)
{
gpib_board_t *board = urb->context;
struct agilent_82357a_priv *a_priv = board->private_data;
+ struct usb_device *usb_dev = interface_to_usbdev(a_priv->bus_interface);
int retval;
u8 *transfer_buffer = urb->transfer_buffer;
unsigned long interrupt_flags;
@@ -1062,7 +1096,7 @@ static void agilent_82357a_interrupt_complete(struct urb *urb)
default: /* other error, resubmit */
retval = usb_submit_urb(a_priv->interrupt_urb, GFP_ATOMIC);
if (retval)
- pr_err("%s: failed to resubmit interrupt urb\n", __func__);
+ dev_err(&usb_dev->dev, "%s: failed to resubmit interrupt urb\n", __func__);
return;
}
@@ -1078,7 +1112,7 @@ static void agilent_82357a_interrupt_complete(struct urb *urb)
retval = usb_submit_urb(a_priv->interrupt_urb, GFP_ATOMIC);
if (retval)
- pr_err("%s: failed to resubmit interrupt urb\n", __func__);
+ dev_err(&usb_dev->dev, "%s: failed to resubmit interrupt urb\n", __func__);
}
static int agilent_82357a_setup_urbs(gpib_board_t *board)
@@ -1114,7 +1148,8 @@ static int agilent_82357a_setup_urbs(gpib_board_t *board)
if (retval) {
usb_free_urb(a_priv->interrupt_urb);
a_priv->interrupt_urb = NULL;
- pr_err("%s: failed to submit first interrupt urb, retval=%i\n", __func__, retval);
+ dev_err(&usb_dev->dev, "%s: failed to submit first interrupt urb, retval=%i\n",
+ __func__, retval);
goto setup_exit;
}
mutex_unlock(&a_priv->interrupt_alloc_lock);
@@ -1130,6 +1165,7 @@ static int agilent_82357a_setup_urbs(gpib_board_t *board)
static int agilent_82357a_reset_usb_configuration(gpib_board_t *board)
{
struct agilent_82357a_priv *a_priv = board->private_data;
+ struct usb_device *usb_dev = interface_to_usbdev(a_priv->bus_interface);
struct usb_device *usb_dev;
int retval;
@@ -1138,7 +1174,8 @@ static int agilent_82357a_reset_usb_configuration(gpib_board_t *board)
usb_dev = interface_to_usbdev(a_priv->bus_interface);
retval = usb_reset_configuration(usb_dev);
if (retval)
- pr_err("%s: usb_reset_configuration() returned %i\n", __func__, retval);
+ dev_err(&usb_dev->dev, "%s: usb_reset_configuration() returned %i\n",
+ __func__, retval);
return retval;
}
#endif
@@ -1179,6 +1216,7 @@ static void agilent_82357a_free_private(struct agilent_82357a_priv *a_priv)
static int agilent_82357a_init(gpib_board_t *board)
{
struct agilent_82357a_priv *a_priv = board->private_data;
+ struct usb_device *usb_dev = interface_to_usbdev(a_priv->bus_interface);
struct agilent_82357a_register_pairlet hw_control;
struct agilent_82357a_register_pairlet writes[0x20];
int retval;
@@ -1194,7 +1232,8 @@ static int agilent_82357a_init(gpib_board_t *board)
++i;
retval = agilent_82357a_write_registers(a_priv, writes, i);
if (retval) {
- pr_err("%s: agilent_82357a_write_registers() returned error\n", __func__);
+ dev_err(&usb_dev->dev, "%s: agilent_82357a_write_registers() returned error\n",
+ __func__);
return -EIO;
}
set_current_state(TASK_INTERRUPTIBLE);
@@ -1259,18 +1298,20 @@ static int agilent_82357a_init(gpib_board_t *board)
writes[i].value = FIRMWARE_LED_CONTROL;
++i;
if (i > ARRAY_SIZE(writes)) {
- pr_err("%s: bug! writes[] overflow\n", __func__);
+ dev_err(&usb_dev->dev, "%s: bug! writes[] overflow\n", __func__);
return -EFAULT;
}
retval = agilent_82357a_write_registers(a_priv, writes, i);
if (retval) {
- pr_err("%s: agilent_82357a_write_registers() returned error\n", __func__);
+ dev_err(&usb_dev->dev, "%s: agilent_82357a_write_registers() returned error\n",
+ __func__);
return -EIO;
}
hw_control.address = HW_CONTROL;
retval = agilent_82357a_read_registers(a_priv, &hw_control, 1, 1);
if (retval) {
- pr_err("%s: agilent_82357a_read_registers() returned error\n", __func__);
+ dev_err(&usb_dev->dev, "%s: agilent_82357a_read_registers() returned error\n",
+ __func__);
return -EIO;
}
a_priv->hw_control_bits = (hw_control.value & ~0x7) | NOT_TI_RESET | NOT_PARALLEL_POLL;
@@ -1338,7 +1379,7 @@ static int agilent_82357a_attach(gpib_board_t *board, const gpib_board_config_t
a_priv->interrupt_in_endpoint = AGILENT_82357B_INTERRUPT_IN_ENDPOINT;
break;
default:
- pr_err("bug, unhandled product_id in switch?\n");
+ dev_err(&usb_dev->dev, "bug, unhandled product_id in switch?\n");
return -EIO;
}
#ifdef RESET_USB_CONFIG
@@ -1365,7 +1406,7 @@ static int agilent_82357a_attach(gpib_board_t *board, const gpib_board_config_t
return retval;
}
- pr_info("%s: attached\n", __func__);
+ dev_info(&usb_dev->dev, "%s: attached\n", __func__);
mutex_unlock(&agilent_82357a_hotplug_lock);
return retval;
}
@@ -1373,6 +1414,7 @@ static int agilent_82357a_attach(gpib_board_t *board, const gpib_board_config_t
static int agilent_82357a_go_idle(gpib_board_t *board)
{
struct agilent_82357a_priv *a_priv = board->private_data;
+ struct usb_device *usb_dev = interface_to_usbdev(a_priv->bus_interface);
struct agilent_82357a_register_pairlet writes[0x20];
int retval;
int i;
@@ -1399,12 +1441,13 @@ static int agilent_82357a_go_idle(gpib_board_t *board)
writes[i].value = 0;
++i;
if (i > ARRAY_SIZE(writes)) {
- pr_err("%s: bug! writes[] overflow\n", __func__);
+ dev_err(&usb_dev->dev, "%s: bug! writes[] overflow\n", __func__);
return -EFAULT;
}
retval = agilent_82357a_write_registers(a_priv, writes, i);
if (retval) {
- pr_err("%s: agilent_82357a_write_registers() returned error\n", __func__);
+ dev_err(&usb_dev->dev, "%s: agilent_82357a_write_registers() returned error\n",
+ __func__);
return -EIO;
}
return 0;
@@ -1413,10 +1456,12 @@ static int agilent_82357a_go_idle(gpib_board_t *board)
static void agilent_82357a_detach(gpib_board_t *board)
{
struct agilent_82357a_priv *a_priv;
+ struct usb_device *usb_dev;
mutex_lock(&agilent_82357a_hotplug_lock);
a_priv = board->private_data;
+ usb_dev = interface_to_usbdev(a_priv->bus_interface);
if (a_priv) {
if (a_priv->bus_interface) {
agilent_82357a_go_idle(board);
@@ -1428,7 +1473,7 @@ static void agilent_82357a_detach(gpib_board_t *board)
agilent_82357a_cleanup_urbs(a_priv);
agilent_82357a_free_private(a_priv);
}
- pr_info("%s: detached\n", __func__);
+ dev_info(&usb_dev->dev, "%s: detached\n", __func__);
mutex_unlock(&agilent_82357a_hotplug_lock);
}
@@ -1476,32 +1521,35 @@ static int agilent_82357a_driver_probe(struct usb_interface *interface,
int i;
char *path;
static const int path_length = 1024;
+ struct usb_device *usb_dev;
if (mutex_lock_interruptible(&agilent_82357a_hotplug_lock))
return -ERESTARTSYS;
- usb_get_dev(interface_to_usbdev(interface));
+ usb_dev = usb_get_dev(interface_to_usbdev(interface));
for (i = 0; i < MAX_NUM_82357A_INTERFACES; ++i) {
if (!agilent_82357a_driver_interfaces[i]) {
agilent_82357a_driver_interfaces[i] = interface;
usb_set_intfdata(interface, NULL);
- GPIB_DPRINTK("set bus interface %i to address 0x%p\n", i, interface);
+ dev_dbg(&usb_dev->dev, "set bus interface %i to address 0x%p\n",
+ i, interface);
break;
}
}
if (i == MAX_NUM_82357A_INTERFACES) {
- usb_put_dev(interface_to_usbdev(interface));
+ usb_put_dev(usb_dev);
mutex_unlock(&agilent_82357a_hotplug_lock);
- pr_err("%s: out of space in agilent_82357a_driver_interfaces[]\n", __func__);
+ dev_err(&usb_dev->dev, "%s: out of space in agilent_82357a_driver_interfaces[]\n",
+ __func__);
return -1;
}
path = kmalloc(path_length, GFP_KERNEL);
if (!path) {
- usb_put_dev(interface_to_usbdev(interface));
+ usb_put_dev(usb_dev);
mutex_unlock(&agilent_82357a_hotplug_lock);
return -ENOMEM;
}
- usb_make_path(interface_to_usbdev(interface), path, path_length);
- pr_info("probe succeeded for path: %s\n", path);
+ usb_make_path(usb_dev, path, path_length);
+ dev_info(&usb_dev->dev, "probe succeeded for path: %s\n", path);
kfree(path);
mutex_unlock(&agilent_82357a_hotplug_lock);
return 0;
@@ -1510,6 +1558,7 @@ static int agilent_82357a_driver_probe(struct usb_interface *interface,
static void agilent_82357a_driver_disconnect(struct usb_interface *interface)
{
int i;
+ struct usb_device *usb_dev = interface_to_usbdev(interface);
mutex_lock(&agilent_82357a_hotplug_lock);
@@ -1531,22 +1580,22 @@ static void agilent_82357a_driver_disconnect(struct usb_interface *interface)
mutex_unlock(&a_priv->control_alloc_lock);
}
}
- GPIB_DPRINTK("nulled agilent_82357a_driver_interfaces[%i]\n", i);
+ dev_dbg(&usb_dev->dev, "nulled agilent_82357a_driver_interfaces[%i]\n", i);
agilent_82357a_driver_interfaces[i] = NULL;
break;
}
}
if (i == MAX_NUM_82357A_INTERFACES)
- pr_err("unable to find interface in agilent_82357a_driver_interfaces[]? bug?\n");
- usb_put_dev(interface_to_usbdev(interface));
+ dev_err(&usb_dev->dev, "unable to find interface in agilent_82357a_driver_interfaces[]? bug?\n");
+ usb_put_dev(usb_dev);
mutex_unlock(&agilent_82357a_hotplug_lock);
}
static int agilent_82357a_driver_suspend(struct usb_interface *interface, pm_message_t message)
{
- struct usb_device *usb_dev;
int i, retval;
+ struct usb_device *usb_dev = interface_to_usbdev(interface);
mutex_lock(&agilent_82357a_hotplug_lock);
@@ -1562,15 +1611,14 @@ static int agilent_82357a_driver_suspend(struct usb_interface *interface, pm_mes
agilent_82357a_abort(a_priv, 0);
retval = agilent_82357a_go_idle(board);
if (retval) {
- pr_err("%s: failed to go idle, retval=%i\n",
- __func__, retval);
+ dev_err(&usb_dev->dev, "%s: failed to go idle, retval=%i\n",
+ __func__, retval);
mutex_unlock(&agilent_82357a_hotplug_lock);
return retval;
}
mutex_lock(&a_priv->interrupt_alloc_lock);
agilent_82357a_cleanup_urbs(a_priv);
mutex_unlock(&a_priv->interrupt_alloc_lock);
- usb_dev = interface_to_usbdev(a_priv->bus_interface);
dev_info(&usb_dev->dev,
"bus %d dev num %d gpib minor %d, agilent usb interface %i suspended\n",
usb_dev->bus->busnum, usb_dev->devnum,
@@ -1588,7 +1636,7 @@ static int agilent_82357a_driver_suspend(struct usb_interface *interface, pm_mes
static int agilent_82357a_driver_resume(struct usb_interface *interface)
{
- struct usb_device *usb_dev;
+ struct usb_device *usb_dev = interface_to_usbdev(interface);
gpib_board_t *board;
int i, retval;
@@ -1611,8 +1659,8 @@ static int agilent_82357a_driver_resume(struct usb_interface *interface)
mutex_lock(&a_priv->interrupt_alloc_lock);
retval = usb_submit_urb(a_priv->interrupt_urb, GFP_KERNEL);
if (retval) {
- pr_err("%s: failed to resubmit interrupt urb, retval=%i\n",
- __func__, retval);
+ dev_err(&usb_dev->dev, "%s: failed to resubmit interrupt urb, retval=%i\n",
+ __func__, retval);
mutex_unlock(&a_priv->interrupt_alloc_lock);
mutex_unlock(&agilent_82357a_hotplug_lock);
return retval;
@@ -1635,7 +1683,6 @@ static int agilent_82357a_driver_resume(struct usb_interface *interface)
// assert/unassert REN
agilent_82357a_remote_enable(board, a_priv->ren_state);
- usb_dev = interface_to_usbdev(a_priv->bus_interface);
dev_info(&usb_dev->dev,
"bus %d dev num %d gpib minor %d, agilent usb interface %i resumed\n",
usb_dev->bus->busnum, usb_dev->devnum, board->minor, i);
@@ -1678,4 +1725,3 @@ static void __exit agilent_82357a_exit_module(void)
module_init(agilent_82357a_init_module);
module_exit(agilent_82357a_exit_module);
-
--
2.46.2
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 05/11] staging: gpib: Remove GPIB_DEBUG reference and update messaging
2024-11-03 21:26 [PATCH v2 00/11] staging: gpib: Patch set for gpib staging drivers Dave Penkler
` (3 preceding siblings ...)
2024-11-03 21:26 ` [PATCH 04/11] staging: gpib: Update messaging and usb_device refs in agilent_usb Dave Penkler
@ 2024-11-03 21:26 ` Dave Penkler
2024-11-04 8:43 ` Dan Carpenter
2024-11-03 21:26 ` [PATCH 06/11] staging: gpib: Use dev_xxx for messaging Dave Penkler
` (5 subsequent siblings)
10 siblings, 1 reply; 16+ messages in thread
From: Dave Penkler @ 2024-11-03 21:26 UTC (permalink / raw)
To: gregkh, linux-staging, linux-kernel
Cc: skhan, arnd, dan.carpenter, Dave Penkler
Change pr_alert to dev_alert
Signed-off-by: Dave Penkler <dpenkler@gmail.com>
---
.../gpib/lpvo_usb_gpib/lpvo_usb_gpib.c | 69 +++++++++----------
1 file changed, 34 insertions(+), 35 deletions(-)
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 4c580137043f..796c3a5be545 100644
--- a/drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c
+++ b/drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c
@@ -68,11 +68,8 @@ MODULE_DEVICE_TABLE(usb, skel_table);
* At module loading: modprobe lpvo_usb_gpib debug={0,1,2}
* On the fly: echo {0,1,2} > /sys/modules/lpvo_usb_gpib/parameters/debug
*/
-#ifdef GPIB_DEBUG
-static int debug = 1;
-#else
+
static int debug;
-#endif
module_param(debug, int, 0644);
#define DIA_LOG(level, format, ...) \
@@ -366,10 +363,10 @@ static int one_char(gpib_board_t *board, struct char_buf *b)
DIA_LOG(2, "--> %x\n", b->inbuf[b->last - b->nchar]);
return b->inbuf[b->last - b->nchar--];
} else if (b->nchar == 0) {
- pr_alert("%s:%s - read returned EOF\n", NAME, __func__);
+ dev_alert(board->gpib_dev, "%s:%s - read returned EOF\n", NAME, __func__);
return -EIO;
}
- pr_alert("%s:%s - read error %d\n", NAME, __func__, b->nchar);
+ dev_alert(board->gpib_dev, "%s:%s - read error %d\n", NAME, __func__, b->nchar);
TTY_LOG("\n *** %s *** Read Error - %s\n", NAME,
"Reset the adapter with 'gpib_config'\n");
return -EIO;
@@ -412,8 +409,8 @@ static void set_timeout(gpib_board_t *board)
}
if (val != ACK) {
- pr_alert("%s:%s - error in timeout set: <%s>\n",
- NAME, __func__, command);
+ dev_alert(board->gpib_dev, "%s:%s - error in timeout set: <%s>\n",
+ NAME, __func__, command);
} else {
data->timeout = board->usec_timeout;
}
@@ -456,8 +453,8 @@ static int usb_gpib_attach(gpib_board_t *board, const gpib_board_config_t *confi
if (config->device_path) {
/* if config->device_path given, try that first */
- pr_alert("%s:%s - Looking for device_path: %s\n",
- NAME, __func__, config->device_path);
+ dev_alert(board->gpib_dev, "%s:%s - Looking for device_path: %s\n",
+ NAME, __func__, config->device_path);
for (j = 0 ; j < MAX_DEV ; j++) {
if ((assigned_usb_minors & 1 << j) == 0)
continue;
@@ -492,7 +489,8 @@ static int usb_gpib_attach(gpib_board_t *board, const gpib_board_config_t *confi
mutex_unlock(&minors_lock);
if (j == MAX_DEV) {
- pr_alert("%s:%s - Requested device is not registered.\n", NAME, __func__);
+ dev_alert(board->gpib_dev, "%s:%s - Requested device is not registered.\n",
+ NAME, __func__);
return -EIO;
}
@@ -737,7 +735,8 @@ static int usb_gpib_line_status(const gpib_board_t *board)
buffer = send_command((gpib_board_t *)board, USB_GPIB_STATUS, 0);
if (buffer < 0) {
- pr_alert("%s:%s - line status read failed with %d\n", NAME, __func__, buffer);
+ dev_alert(board->gpib_dev, "%s:%s - line status read failed with %d\n",
+ NAME, __func__, buffer);
return -1;
}
@@ -777,7 +776,7 @@ static int usb_gpib_parallel_poll(gpib_board_t *board, uint8_t *result)
retval = set_control_line(board, IB_BUS_EOI, 1);
if (retval != ACK) {
- pr_alert("%s:%s - assert EOI failed\n", NAME, __func__);
+ dev_alert(board->gpib_dev, "%s:%s - assert EOI failed\n", NAME, __func__);
return -EIO;
}
@@ -787,7 +786,7 @@ static int usb_gpib_parallel_poll(gpib_board_t *board, uint8_t *result)
retval = set_control_line(board, IB_BUS_EOI, 0);
if (retval != 0x06) {
- pr_alert("%s:%s - unassert EOI failed\n", NAME, __func__);
+ dev_alert(board->gpib_dev, "%s:%s - unassert EOI failed\n", NAME, __func__);
return -EIO;
}
@@ -869,8 +868,8 @@ static int usb_gpib_read(gpib_board_t *board,
goto read_return;
if (one_char(board, &b) != DLE || one_char(board, &b) != STX) {
- pr_alert("%s:%s - wrong <DLE><STX> sequence\n",
- NAME, __func__);
+ dev_alert(board->gpib_dev, "%s:%s - wrong <DLE><STX> sequence\n",
+ NAME, __func__);
retval = -EIO;
goto read_return;
}
@@ -910,15 +909,15 @@ static int usb_gpib_read(gpib_board_t *board,
retval = 0;
goto read_return;
} else {
- pr_alert("%s:%s - %s %x\n",
- NAME, __func__,
- "Wrong end of message", c);
+ dev_alert(board->gpib_dev, "%s:%s - %s %x\n",
+ NAME, __func__,
+ "Wrong end of message", c);
retval = -ETIME;
goto read_return;
}
} else {
- pr_alert("%s:%s - %s\n", NAME, __func__,
- "lone <DLE> in stream");
+ dev_alert(board->gpib_dev, "%s:%s - %s\n", NAME, __func__,
+ "lone <DLE> in stream");
retval = -EIO;
goto read_return;
}
@@ -937,8 +936,8 @@ static int usb_gpib_read(gpib_board_t *board,
c = one_char(board, &b);
if (c == ACK) {
if (MAX_READ_EXCESS - read_count > 1)
- pr_alert("%s:%s - %s\n", NAME, __func__,
- "small buffer - maybe some data lost");
+ dev_alert(board->gpib_dev, "%s:%s - %s\n", NAME, __func__,
+ "small buffer - maybe some data lost");
retval = 0;
goto read_return;
}
@@ -946,8 +945,8 @@ static int usb_gpib_read(gpib_board_t *board,
}
}
- pr_alert("%s:%s - no input end - GPIB board in odd state\n",
- NAME, __func__);
+ dev_alert(board->gpib_dev, "%s:%s - no input end - GPIB board in odd state\n",
+ NAME, __func__);
retval = -EIO;
read_return:
@@ -973,8 +972,8 @@ static void usb_gpib_remote_enable(gpib_board_t *board, int enable)
retval = set_control_line(board, IB_BUS_REN, enable ? 1 : 0);
if (retval != ACK)
- pr_alert("%s:%s - could not set REN line: %x\n",
- NAME, __func__, retval);
+ dev_alert(board->gpib_dev, "%s:%s - could not set REN line: %x\n",
+ NAME, __func__, retval);
DIA_LOG(1, "done with %x\n", retval);
}
@@ -1072,21 +1071,21 @@ static int usb_gpib_write(gpib_board_t *board,
static void usb_gpib_parallel_poll_configure(gpib_board_t *board,
uint8_t configuration)
{
- pr_alert("%s:%s - currently a NOP\n", NAME, __func__);
+ dev_alert(board->gpib_dev, "%s:%s - currently a NOP\n", NAME, __func__);
}
/* parallel_poll_response */
static void usb_gpib_parallel_poll_response(gpib_board_t *board, int ist)
{
- pr_alert("%s:%s - currently a NOP\n", NAME, __func__);
+ dev_alert(board->gpib_dev, "%s:%s - currently a NOP\n", NAME, __func__);
}
/* primary_address */
static int usb_gpib_primary_address(gpib_board_t *board, unsigned int address)
{
- pr_alert("%s:%s - currently a NOP\n", NAME, __func__);
+ dev_alert(board->gpib_dev, "%s:%s - currently a NOP\n", NAME, __func__);
return 0;
}
@@ -1094,7 +1093,7 @@ static int usb_gpib_primary_address(gpib_board_t *board, unsigned int address)
static void usb_gpib_return_to_local(gpib_board_t *board)
{
- pr_alert("%s:%s - currently a NOP\n", NAME, __func__);
+ dev_alert(board->gpib_dev, "%s:%s - currently a NOP\n", NAME, __func__);
}
/* secondary_address */
@@ -1103,7 +1102,7 @@ static int usb_gpib_secondary_address(gpib_board_t *board,
unsigned int address,
int enable)
{
- pr_alert("%s:%s - currently a NOP\n", NAME, __func__);
+ dev_alert(board->gpib_dev, "%s:%s - currently a NOP\n", NAME, __func__);
return 0;
}
@@ -1111,14 +1110,14 @@ static int usb_gpib_secondary_address(gpib_board_t *board,
static void usb_gpib_serial_poll_response(gpib_board_t *board, uint8_t status)
{
- pr_alert("%s:%s - currently a NOP\n", NAME, __func__);
+ dev_alert(board->gpib_dev, "%s:%s - currently a NOP\n", NAME, __func__);
}
/* serial_poll_status */
static uint8_t usb_gpib_serial_poll_status(gpib_board_t *board)
{
- pr_alert("%s:%s - currently a NOP\n", NAME, __func__);
+ dev_alert(board->gpib_dev, "%s:%s - currently a NOP\n", NAME, __func__);
return 0;
}
@@ -1126,7 +1125,7 @@ static uint8_t usb_gpib_serial_poll_status(gpib_board_t *board)
static unsigned int usb_gpib_t1_delay(gpib_board_t *board, unsigned int nano_sec)
{
- pr_alert("%s:%s - currently a NOP\n", NAME, __func__);
+ dev_alert(board->gpib_dev, "%s:%s - currently a NOP\n", NAME, __func__);
return 0;
}
--
2.46.2
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 06/11] staging: gpib: Use dev_xxx for messaging
2024-11-03 21:26 [PATCH v2 00/11] staging: gpib: Patch set for gpib staging drivers Dave Penkler
` (4 preceding siblings ...)
2024-11-03 21:26 ` [PATCH 05/11] staging: gpib: Remove GPIB_DEBUG reference and update messaging Dave Penkler
@ 2024-11-03 21:26 ` Dave Penkler
2024-11-03 21:26 ` [PATCH 07/11] staging: gpib: Fix Kconfig Dave Penkler
` (4 subsequent siblings)
10 siblings, 0 replies; 16+ messages in thread
From: Dave Penkler @ 2024-11-03 21:26 UTC (permalink / raw)
To: gregkh, linux-staging, linux-kernel
Cc: skhan, arnd, dan.carpenter, Dave Penkler
Change pr_xxx to dev_xxx
Signed-off-by: Dave Penkler <dpenkler@gmail.com>
---
.../gpib/agilent_82350b/agilent_82350b.c | 70 +++++++++++--------
1 file changed, 42 insertions(+), 28 deletions(-)
diff --git a/drivers/staging/gpib/agilent_82350b/agilent_82350b.c b/drivers/staging/gpib/agilent_82350b/agilent_82350b.c
index 3aa624486c0f..53006d0cc79c 100644
--- a/drivers/staging/gpib/agilent_82350b/agilent_82350b.c
+++ b/drivers/staging/gpib/agilent_82350b/agilent_82350b.c
@@ -52,7 +52,8 @@ int agilent_82350b_accel_read(gpib_board_t *board, uint8_t *buffer, size_t lengt
retval = tms9914_read(board, tms_priv, buffer, 1, end, &num_bytes);
*bytes_read += num_bytes;
if (retval < 0)
- pr_err("%s: tms9914_read failed retval=%i\n", driver_name, retval);
+ dev_err(board->gpib_dev, "%s: tms9914_read failed retval=%i\n",
+ driver_name, retval);
if (retval < 0 || *end)
return retval;
++buffer;
@@ -88,7 +89,7 @@ int agilent_82350b_accel_read(gpib_board_t *board, uint8_t *buffer, size_t lengt
test_bit(DEV_CLEAR_BN, &tms_priv->state) ||
test_bit(TIMO_NUM, &board->status));
if (retval) {
- pr_err("%s: read wait interrupted\n", driver_name);
+ dev_dbg(board->gpib_dev, "%s: read wait interrupted\n", driver_name);
retval = -ERESTARTSYS;
break;
}
@@ -102,12 +103,13 @@ int agilent_82350b_accel_read(gpib_board_t *board, uint8_t *buffer, size_t lengt
*end = 1;
}
if (test_bit(TIMO_NUM, &board->status)) {
- pr_err("%s: minor %i: read timed out\n", driver_name, board->minor);
+ dev_err(board->gpib_dev, "%s: read timed out\n", driver_name);
retval = -ETIMEDOUT;
break;
}
if (test_bit(DEV_CLEAR_BN, &tms_priv->state)) {
- pr_err("%s: device clear interrupted read\n", driver_name);
+ dev_err(board->gpib_dev, "%s: device clear interrupted read\n",
+ driver_name);
retval = -EINTR;
break;
}
@@ -138,15 +140,15 @@ static int translate_wait_return_value(gpib_board_t *board, int retval)
struct tms9914_priv *tms_priv = &a_priv->tms9914_priv;
if (retval) {
- pr_err("%s: write wait interrupted\n", driver_name);
+ dev_err(board->gpib_dev, "%s: write wait interrupted\n", driver_name);
return -ERESTARTSYS;
}
if (test_bit(TIMO_NUM, &board->status)) {
- pr_err("%s: minor %i: write timed out\n", driver_name, board->minor);
+ dev_err(board->gpib_dev, "%s: write timed out\n", driver_name);
return -ETIMEDOUT;
}
if (test_bit(DEV_CLEAR_BN, &tms_priv->state)) {
- pr_err("%s: device clear interrupted write\n", driver_name);
+ dev_err(board->gpib_dev, "%s: device clear interrupted write\n", driver_name);
return -EINTR;
}
return 0;
@@ -558,10 +560,11 @@ static int init_82350a_hardware(gpib_board_t *board, const gpib_board_config_t *
return 0;
// need to programme borg
if (!config->init_data || config->init_data_length != firmware_length) {
- pr_err("%s: the 82350A board requires firmware after powering on.\n", driver_name);
+ dev_err(board->gpib_dev, "%s: the 82350A board requires firmware after powering on.\n",
+ driver_name);
return -EIO;
}
- pr_info("%s: Loading firmware...\n", driver_name);
+ dev_info(board->gpib_dev, "%s: Loading firmware...\n", driver_name);
// tickle the borg
writel(plx_cntrl_static_bits | PLX9050_USER3_DATA_BIT,
@@ -580,7 +583,7 @@ static int init_82350a_hardware(gpib_board_t *board, const gpib_board_config_t *
usleep_range(10, 20);
}
if (j == timeout) {
- pr_err("%s: timed out loading firmware.\n", driver_name);
+ dev_err(board->gpib_dev, "%s: timed out loading firmware.\n", driver_name);
return -ETIMEDOUT;
}
writeb(firmware_data[i], a_priv->gpib_base + CONFIG_DATA_REG);
@@ -591,10 +594,11 @@ static int init_82350a_hardware(gpib_board_t *board, const gpib_board_config_t *
usleep_range(10, 20);
}
if (j == timeout) {
- pr_err("%s: timed out waiting for firmware load to complete.\n", driver_name);
+ dev_err(board->gpib_dev, "%s: timed out waiting for firmware load to complete.\n",
+ driver_name);
return -ETIMEDOUT;
}
- pr_info("%s: ...done.\n", driver_name);
+ dev_info(board->gpib_dev, "%s: ...done.\n", driver_name);
return 0;
}
@@ -616,14 +620,15 @@ static int test_sram(gpib_board_t *board)
unsigned int read_value = readb(a_priv->sram_base + i);
if ((i & byte_mask) != read_value) {
- pr_err("%s: SRAM test failed at %d wanted %d got %d\n",
- driver_name, i, (i & byte_mask), read_value);
+ dev_err(board->gpib_dev, "%s: SRAM test failed at %d wanted %d got %d\n",
+ driver_name, i, (i & byte_mask), read_value);
return -EIO;
}
if (need_resched())
schedule();
}
- pr_info("%s: SRAM test passed 0x%x bytes checked\n", driver_name, sram_length);
+ dev_info(board->gpib_dev, "%s: SRAM test passed 0x%x bytes checked\n",
+ driver_name, sram_length);
return 0;
}
@@ -651,14 +656,14 @@ static int agilent_82350b_generic_attach(gpib_board_t *board, const gpib_board_c
PCI_DEVICE_ID_82350B, NULL);
if (a_priv->pci_device) {
a_priv->model = MODEL_82350B;
- pr_info("%s: Agilent 82350B board found\n", driver_name);
+ dev_info(board->gpib_dev, "%s: Agilent 82350B board found\n", driver_name);
} else {
a_priv->pci_device = gpib_pci_get_device(config, PCI_VENDOR_ID_AGILENT,
PCI_DEVICE_ID_82351A, NULL);
if (a_priv->pci_device) {
a_priv->model = MODEL_82351A;
- pr_info("%s: Agilent 82351B board found\n", driver_name);
+ dev_info(board->gpib_dev, "%s: Agilent 82351B board found\n", driver_name);
} else {
a_priv->pci_device = gpib_pci_get_subsys(config, PCI_VENDOR_ID_PLX,
@@ -668,15 +673,17 @@ static int agilent_82350b_generic_attach(gpib_board_t *board, const gpib_board_c
a_priv->pci_device);
if (a_priv->pci_device) {
a_priv->model = MODEL_82350A;
- pr_info("%s: HP/Agilent 82350A board found\n", driver_name);
+ dev_info(board->gpib_dev, "%s: HP/Agilent 82350A board found\n",
+ driver_name);
} else {
- pr_err("%s: no 82350/82351 board found\n", driver_name);
+ dev_err(board->gpib_dev, "%s: no 82350/82351 board found\n",
+ driver_name);
return -ENODEV;
}
}
}
if (pci_enable_device(a_priv->pci_device)) {
- pr_err("%s: error enabling pci device\n", driver_name);
+ dev_err(board->gpib_dev, "%s: error enabling pci device\n", driver_name);
return -EIO;
}
if (pci_request_regions(a_priv->pci_device, driver_name))
@@ -685,23 +692,27 @@ static int agilent_82350b_generic_attach(gpib_board_t *board, const gpib_board_c
case MODEL_82350A:
a_priv->plx_base = ioremap(pci_resource_start(a_priv->pci_device, PLX_MEM_REGION),
pci_resource_len(a_priv->pci_device, PLX_MEM_REGION));
- pr_info("%s: plx base address remapped to 0x%p\n", driver_name, a_priv->plx_base);
+ dev_dbg(board->gpib_dev, "%s: plx base address remapped to 0x%p\n",
+ driver_name, a_priv->plx_base);
a_priv->gpib_base = ioremap(pci_resource_start(a_priv->pci_device,
GPIB_82350A_REGION),
pci_resource_len(a_priv->pci_device,
GPIB_82350A_REGION));
- pr_info("%s: gpib base address remapped to 0x%p\n", driver_name, a_priv->gpib_base);
+ dev_dbg(board->gpib_dev, "%s: gpib base address remapped to 0x%p\n",
+ driver_name, a_priv->gpib_base);
tms_priv->iobase = a_priv->gpib_base + TMS9914_BASE_REG;
a_priv->sram_base = ioremap(pci_resource_start(a_priv->pci_device,
SRAM_82350A_REGION),
pci_resource_len(a_priv->pci_device,
SRAM_82350A_REGION));
- pr_info("%s: sram base address remapped to 0x%p\n", driver_name, a_priv->sram_base);
+ dev_dbg(board->gpib_dev, "%s: sram base address remapped to 0x%p\n",
+ driver_name, a_priv->sram_base);
a_priv->borg_base = ioremap(pci_resource_start(a_priv->pci_device,
BORG_82350A_REGION),
pci_resource_len(a_priv->pci_device,
BORG_82350A_REGION));
- pr_info("%s: borg base address remapped to 0x%p\n", driver_name, a_priv->borg_base);
+ dev_dbg(board->gpib_dev, "%s: borg base address remapped to 0x%p\n",
+ driver_name, a_priv->borg_base);
retval = init_82350a_hardware(board, config);
if (retval < 0)
@@ -711,14 +722,17 @@ static int agilent_82350b_generic_attach(gpib_board_t *board, const gpib_board_c
case MODEL_82351A:
a_priv->gpib_base = ioremap(pci_resource_start(a_priv->pci_device, GPIB_REGION),
pci_resource_len(a_priv->pci_device, GPIB_REGION));
- pr_info("%s: gpib base address remapped to 0x%p\n", driver_name, a_priv->gpib_base);
+ dev_dbg(board->gpib_dev, "%s: gpib base address remapped to 0x%p\n",
+ driver_name, a_priv->gpib_base);
tms_priv->iobase = a_priv->gpib_base + TMS9914_BASE_REG;
a_priv->sram_base = ioremap(pci_resource_start(a_priv->pci_device, SRAM_REGION),
pci_resource_len(a_priv->pci_device, SRAM_REGION));
- pr_info("%s: sram base address remapped to 0x%p\n", driver_name, a_priv->sram_base);
+ dev_dbg(board->gpib_dev, "%s: sram base address remapped to 0x%p\n",
+ driver_name, a_priv->sram_base);
a_priv->misc_base = ioremap(pci_resource_start(a_priv->pci_device, MISC_REGION),
pci_resource_len(a_priv->pci_device, MISC_REGION));
- pr_info("%s: misc base address remapped to 0x%p\n", driver_name, a_priv->misc_base);
+ dev_dbg(board->gpib_dev, "%s: misc base address remapped to 0x%p\n",
+ driver_name, a_priv->misc_base);
break;
default:
pr_err("%s: invalid board\n", driver_name);
@@ -735,7 +749,7 @@ static int agilent_82350b_generic_attach(gpib_board_t *board, const gpib_board_c
return -EIO;
}
a_priv->irq = a_priv->pci_device->irq;
- pr_info("%s: IRQ %d\n", driver_name, a_priv->irq);
+ dev_dbg(board->gpib_dev, "%s: IRQ %d\n", driver_name, a_priv->irq);
writeb(0, a_priv->gpib_base + SRAM_ACCESS_CONTROL_REG);
a_priv->card_mode_bits = ENABLE_PCI_IRQ_BIT;
--
2.46.2
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 07/11] staging: gpib: Fix Kconfig
2024-11-03 21:26 [PATCH v2 00/11] staging: gpib: Patch set for gpib staging drivers Dave Penkler
` (5 preceding siblings ...)
2024-11-03 21:26 ` [PATCH 06/11] staging: gpib: Use dev_xxx for messaging Dave Penkler
@ 2024-11-03 21:26 ` Dave Penkler
2024-11-03 21:26 ` [PATCH 08/11] staging: gpib: Remove unneeded lookup table Dave Penkler
` (3 subsequent siblings)
10 siblings, 0 replies; 16+ messages in thread
From: Dave Penkler @ 2024-11-03 21:26 UTC (permalink / raw)
To: gregkh, linux-staging, linux-kernel
Cc: skhan, arnd, dan.carpenter, Dave Penkler
The NI_PCI_ISA driver also supports PCI and PCMCIA
Correct spelling error COMPIlE_TEST
Fixes: 2c9f5d8c6ece ("staging: gpib: add bus specific Kconfig dependencies")
Signed-off-by: Dave Penkler <dpenkler@gmail.com>
---
drivers/staging/gpib/Kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/gpib/Kconfig b/drivers/staging/gpib/Kconfig
index 0ea9a276c389..95308d15a555 100644
--- a/drivers/staging/gpib/Kconfig
+++ b/drivers/staging/gpib/Kconfig
@@ -61,7 +61,7 @@ config GPIB_CEC_PCI
config GPIB_NI_PCI_ISA
tristate "NI PCI/ISA compatible boards"
- depends on ISA_BUS
+ depends on ISA_BUS || PCI || PCMCIA
select GPIB_COMMON
select GPIB_NEC7210
help
@@ -138,7 +138,7 @@ config GPIB_FMH
config GPIB_GPIO
tristate "RPi GPIO bitbang"
- depends on ARCH_BCM2835 || COMPIlE_TEST
+ depends on ARCH_BCM2835 || COMPILE_TEST
select GPIB_COMMON
help
GPIB bitbang driver Raspberry Pi GPIO adapters
--
2.46.2
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 08/11] staging: gpib: Remove unneeded lookup table
2024-11-03 21:26 [PATCH v2 00/11] staging: gpib: Patch set for gpib staging drivers Dave Penkler
` (6 preceding siblings ...)
2024-11-03 21:26 ` [PATCH 07/11] staging: gpib: Fix Kconfig Dave Penkler
@ 2024-11-03 21:26 ` Dave Penkler
2024-11-03 21:26 ` [PATCH 09/11] staging: gpib: Remove GPIO14 and GPIO15 lines in lookup tables Dave Penkler
` (2 subsequent siblings)
10 siblings, 0 replies; 16+ messages in thread
From: Dave Penkler @ 2024-11-03 21:26 UTC (permalink / raw)
To: gregkh, linux-staging, linux-kernel
Cc: skhan, arnd, dan.carpenter, Dave Penkler
Remove bcm2837 table as the only difference is GPIO14 and GPIO15
which are not used with the current pin maps.
Signed-off-by: Dave Penkler <dpenkler@gmail.com>
---
drivers/staging/gpib/gpio/gpib_bitbang.c | 33 ------------------------
1 file changed, 33 deletions(-)
diff --git a/drivers/staging/gpib/gpio/gpib_bitbang.c b/drivers/staging/gpib/gpio/gpib_bitbang.c
index 8c03e91c01dc..fc8502379c28 100644
--- a/drivers/staging/gpib/gpio/gpib_bitbang.c
+++ b/drivers/staging/gpib/gpio/gpib_bitbang.c
@@ -234,38 +234,6 @@ static struct gpiod_lookup_table gpib_gpio_table_0 = {
},
};
-static struct gpiod_lookup_table gpib_gpio_table_1 = {
- .dev_id = "", // device id of board device
- .table = {
- // for bcm2837 based pis (3a+ 3b 3b+ )
- GPIO_LOOKUP_IDX("GPIO_GCLK", U16_MAX, NULL, 4, GPIO_ACTIVE_HIGH),
- GPIO_LOOKUP_IDX("GPIO5", U16_MAX, NULL, 5, GPIO_ACTIVE_HIGH),
- GPIO_LOOKUP_IDX("GPIO6", U16_MAX, NULL, 6, GPIO_ACTIVE_HIGH),
- GPIO_LOOKUP_IDX("SPI_CE1_N", U16_MAX, NULL, 7, GPIO_ACTIVE_HIGH),
- GPIO_LOOKUP_IDX("SPI_CE0_N", U16_MAX, NULL, 8, GPIO_ACTIVE_HIGH),
- GPIO_LOOKUP_IDX("SPI_MISO", U16_MAX, NULL, 9, GPIO_ACTIVE_HIGH),
- GPIO_LOOKUP_IDX("SPI_MOSI", U16_MAX, NULL, 10, GPIO_ACTIVE_HIGH),
- GPIO_LOOKUP_IDX("SPI_SCLK", U16_MAX, NULL, 11, GPIO_ACTIVE_HIGH),
- GPIO_LOOKUP_IDX("GPIO12", U16_MAX, NULL, 12, GPIO_ACTIVE_HIGH),
- GPIO_LOOKUP_IDX("GPIO13", U16_MAX, NULL, 13, GPIO_ACTIVE_HIGH),
- GPIO_LOOKUP_IDX("TXD1", U16_MAX, NULL, 14, GPIO_ACTIVE_HIGH),
- GPIO_LOOKUP_IDX("RXD1", U16_MAX, NULL, 15, GPIO_ACTIVE_HIGH),
- GPIO_LOOKUP_IDX("GPIO16", U16_MAX, NULL, 16, GPIO_ACTIVE_HIGH),
- GPIO_LOOKUP_IDX("GPIO17", U16_MAX, NULL, 17, GPIO_ACTIVE_HIGH),
- GPIO_LOOKUP_IDX("GPIO18", U16_MAX, NULL, 18, GPIO_ACTIVE_HIGH),
- GPIO_LOOKUP_IDX("GPIO19", U16_MAX, NULL, 19, GPIO_ACTIVE_HIGH),
- GPIO_LOOKUP_IDX("GPIO20", U16_MAX, NULL, 20, GPIO_ACTIVE_HIGH),
- GPIO_LOOKUP_IDX("GPIO21", U16_MAX, NULL, 21, GPIO_ACTIVE_HIGH),
- GPIO_LOOKUP_IDX("GPIO22", U16_MAX, NULL, 22, GPIO_ACTIVE_HIGH),
- GPIO_LOOKUP_IDX("GPIO23", U16_MAX, NULL, 23, GPIO_ACTIVE_HIGH),
- GPIO_LOOKUP_IDX("GPIO24", U16_MAX, NULL, 24, GPIO_ACTIVE_HIGH),
- GPIO_LOOKUP_IDX("GPIO25", U16_MAX, NULL, 25, GPIO_ACTIVE_HIGH),
- GPIO_LOOKUP_IDX("GPIO26", U16_MAX, NULL, 26, GPIO_ACTIVE_HIGH),
- GPIO_LOOKUP_IDX("GPIO27", U16_MAX, NULL, 27, GPIO_ACTIVE_HIGH),
- { }
- },
-};
-
static struct gpiod_lookup_table gpib_gpio_table_2 = {
.dev_id = "", // device id of board device
.table = {
@@ -300,7 +268,6 @@ static struct gpiod_lookup_table gpib_gpio_table_2 = {
static struct gpiod_lookup_table *lookup_tables[] = {
&gpib_gpio_table_0,
- &gpib_gpio_table_1,
&gpib_gpio_table_2,
0
};
--
2.46.2
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 09/11] staging: gpib: Remove GPIO14 and GPIO15 lines in lookup tables
2024-11-03 21:26 [PATCH v2 00/11] staging: gpib: Patch set for gpib staging drivers Dave Penkler
` (7 preceding siblings ...)
2024-11-03 21:26 ` [PATCH 08/11] staging: gpib: Remove unneeded lookup table Dave Penkler
@ 2024-11-03 21:26 ` Dave Penkler
2024-11-03 21:26 ` [PATCH 10/11] staging: gpib: Re-order the " Dave Penkler
2024-11-03 21:26 ` [PATCH 11/11] staging: gpib: Correct check for max secondary address Dave Penkler
10 siblings, 0 replies; 16+ messages in thread
From: Dave Penkler @ 2024-11-03 21:26 UTC (permalink / raw)
To: gregkh, linux-staging, linux-kernel
Cc: skhan, arnd, dan.carpenter, Dave Penkler
GPIO14 and GPIO15 are not used in the current pin maps
Signed-off-by: Dave Penkler <dpenkler@gmail.com>
---
drivers/staging/gpib/gpio/gpib_bitbang.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/staging/gpib/gpio/gpib_bitbang.c b/drivers/staging/gpib/gpio/gpib_bitbang.c
index fc8502379c28..78032af5061c 100644
--- a/drivers/staging/gpib/gpio/gpib_bitbang.c
+++ b/drivers/staging/gpib/gpio/gpib_bitbang.c
@@ -216,8 +216,6 @@ static struct gpiod_lookup_table gpib_gpio_table_0 = {
GPIO_LOOKUP_IDX("SPI_SCLK", U16_MAX, NULL, 11, GPIO_ACTIVE_HIGH),
GPIO_LOOKUP_IDX("GPIO12", U16_MAX, NULL, 12, GPIO_ACTIVE_HIGH),
GPIO_LOOKUP_IDX("GPIO13", U16_MAX, NULL, 13, GPIO_ACTIVE_HIGH),
- GPIO_LOOKUP_IDX("TXD0", U16_MAX, NULL, 14, GPIO_ACTIVE_HIGH),
- GPIO_LOOKUP_IDX("RXD0", U16_MAX, NULL, 15, GPIO_ACTIVE_HIGH),
GPIO_LOOKUP_IDX("GPIO16", U16_MAX, NULL, 16, GPIO_ACTIVE_HIGH),
GPIO_LOOKUP_IDX("GPIO17", U16_MAX, NULL, 17, GPIO_ACTIVE_HIGH),
GPIO_LOOKUP_IDX("GPIO18", U16_MAX, NULL, 18, GPIO_ACTIVE_HIGH),
@@ -248,8 +246,6 @@ static struct gpiod_lookup_table gpib_gpio_table_2 = {
GPIO_LOOKUP_IDX("GPIO11", U16_MAX, NULL, 11, GPIO_ACTIVE_HIGH),
GPIO_LOOKUP_IDX("GPIO12", U16_MAX, NULL, 12, GPIO_ACTIVE_HIGH),
GPIO_LOOKUP_IDX("GPIO13", U16_MAX, NULL, 13, GPIO_ACTIVE_HIGH),
- GPIO_LOOKUP_IDX("GPIO14", U16_MAX, NULL, 14, GPIO_ACTIVE_HIGH),
- GPIO_LOOKUP_IDX("GPIO15", U16_MAX, NULL, 15, GPIO_ACTIVE_HIGH),
GPIO_LOOKUP_IDX("GPIO16", U16_MAX, NULL, 16, GPIO_ACTIVE_HIGH),
GPIO_LOOKUP_IDX("GPIO17", U16_MAX, NULL, 17, GPIO_ACTIVE_HIGH),
GPIO_LOOKUP_IDX("GPIO18", U16_MAX, NULL, 18, GPIO_ACTIVE_HIGH),
--
2.46.2
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 10/11] staging: gpib: Re-order the lookup tables
2024-11-03 21:26 [PATCH v2 00/11] staging: gpib: Patch set for gpib staging drivers Dave Penkler
` (8 preceding siblings ...)
2024-11-03 21:26 ` [PATCH 09/11] staging: gpib: Remove GPIO14 and GPIO15 lines in lookup tables Dave Penkler
@ 2024-11-03 21:26 ` Dave Penkler
2024-11-04 8:36 ` Dan Carpenter
2024-11-03 21:26 ` [PATCH 11/11] staging: gpib: Correct check for max secondary address Dave Penkler
10 siblings, 1 reply; 16+ messages in thread
From: Dave Penkler @ 2024-11-03 21:26 UTC (permalink / raw)
To: gregkh, linux-staging, linux-kernel
Cc: skhan, arnd, dan.carpenter, Dave Penkler
Re-order the tables so that the bcm27xx table is used first
as these devices are more popular and numerous than the older ones.
Signed-off-by: Dave Penkler <dpenkler@gmail.com>
---
drivers/staging/gpib/gpio/gpib_bitbang.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/gpib/gpio/gpib_bitbang.c b/drivers/staging/gpib/gpio/gpib_bitbang.c
index 78032af5061c..a2d562cbd65b 100644
--- a/drivers/staging/gpib/gpio/gpib_bitbang.c
+++ b/drivers/staging/gpib/gpio/gpib_bitbang.c
@@ -202,7 +202,7 @@ int gpios_vector[] = {
/* Lookup table for general GPIOs */
-static struct gpiod_lookup_table gpib_gpio_table_0 = {
+static struct gpiod_lookup_table gpib_gpio_table_1 = {
// for bcm2835/6
.dev_id = "", // device id of board device
.table = {
@@ -232,7 +232,7 @@ static struct gpiod_lookup_table gpib_gpio_table_0 = {
},
};
-static struct gpiod_lookup_table gpib_gpio_table_2 = {
+static struct gpiod_lookup_table gpib_gpio_table_0 = {
.dev_id = "", // device id of board device
.table = {
// for bcm27xx based pis (b b+ 2b 3b 3b+ 4 5)
@@ -264,7 +264,7 @@ static struct gpiod_lookup_table gpib_gpio_table_2 = {
static struct gpiod_lookup_table *lookup_tables[] = {
&gpib_gpio_table_0,
- &gpib_gpio_table_2,
+ &gpib_gpio_table_1,
0
};
--
2.46.2
^ permalink raw reply related [flat|nested] 16+ messages in thread
* [PATCH 11/11] staging: gpib: Correct check for max secondary address
2024-11-03 21:26 [PATCH v2 00/11] staging: gpib: Patch set for gpib staging drivers Dave Penkler
` (9 preceding siblings ...)
2024-11-03 21:26 ` [PATCH 10/11] staging: gpib: Re-order the " Dave Penkler
@ 2024-11-03 21:26 ` Dave Penkler
2024-11-04 8:09 ` Dan Carpenter
10 siblings, 1 reply; 16+ messages in thread
From: Dave Penkler @ 2024-11-03 21:26 UTC (permalink / raw)
To: gregkh, linux-staging, linux-kernel
Cc: skhan, arnd, dan.carpenter, Dave Penkler
GPIB secondary addresses can be between 0 and 31 inclusive
unlike primary addresses where address 31 is not a valid device
address. When 31 is used as a primary talk address it
forms the UNT (Untalk) command and when used as a listener address it
forms the UNL (Unlisten) commmand.
The library was incorrectly not allowing a secondary address
with a value of 31 to be used.
Signed-off-by: Dave Penkler <dpenkler@gmail.com>
---
drivers/staging/gpib/common/gpib_os.c | 4 +---
drivers/staging/gpib/common/iblib.c | 6 +++---
drivers/staging/gpib/common/ibsys.h | 3 +++
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/gpib/common/gpib_os.c b/drivers/staging/gpib/common/gpib_os.c
index e84097ac8f69..0285180ae1f0 100644
--- a/drivers/staging/gpib/common/gpib_os.c
+++ b/drivers/staging/gpib/common/gpib_os.c
@@ -525,8 +525,6 @@ int serial_poll_all(gpib_board_t *board, unsigned int usec_timeout)
* SPD and UNT are sent at the completion of the poll.
*/
-static const int gpib_addr_max = 30; /* max address for primary/secondary gpib addresses */
-
int dvrsp(gpib_board_t *board, unsigned int pad, int sad,
unsigned int usec_timeout, uint8_t *result)
{
@@ -538,7 +536,7 @@ int dvrsp(gpib_board_t *board, unsigned int pad, int sad,
return -1;
}
- if (pad > gpib_addr_max || sad > gpib_addr_max) {
+ if (pad > MAX_GPIB_PRIMARY_ADDRESS || sad > MAX_GPIB_SECONDARY_ADDRESS) {
pr_err("gpib: bad address for serial poll");
return -1;
}
diff --git a/drivers/staging/gpib/common/iblib.c b/drivers/staging/gpib/common/iblib.c
index fc57e760c144..db1911cc1b26 100644
--- a/drivers/staging/gpib/common/iblib.c
+++ b/drivers/staging/gpib/common/iblib.c
@@ -479,7 +479,7 @@ int ibsre(gpib_board_t *board, int enable)
*/
int ibpad(gpib_board_t *board, unsigned int addr)
{
- if (addr > 30) {
+ if (addr > MAX_GPIB_PRIMARY_ADDRESS) {
pr_err("gpib: invalid primary address %u\n", addr);
return -1;
}
@@ -498,8 +498,8 @@ int ibpad(gpib_board_t *board, unsigned int addr)
*/
int ibsad(gpib_board_t *board, int addr)
{
- if (addr > 30) {
- pr_err("gpib: invalid secondary address %i, must be 0-30\n", addr);
+ if (addr > MAX_GPIB_SECONDARY_ADDRESS) {
+ pr_err("gpib: invalid secondary address %i\n", addr);
return -1;
}
board->sad = addr;
diff --git a/drivers/staging/gpib/common/ibsys.h b/drivers/staging/gpib/common/ibsys.h
index b78ca5ea4da1..da20971e9c7e 100644
--- a/drivers/staging/gpib/common/ibsys.h
+++ b/drivers/staging/gpib/common/ibsys.h
@@ -16,6 +16,9 @@
#include <asm/irq.h>
#include <asm/dma.h>
+#define MAX_GPIB_PRIMARY_ADDRESS 30
+#define MAX_GPIB_SECONDARY_ADDRESS 31
+
int gpib_allocate_board(gpib_board_t *board);
void gpib_deallocate_board(gpib_board_t *board);
--
2.46.2
^ permalink raw reply related [flat|nested] 16+ messages in thread
* Re: [PATCH 11/11] staging: gpib: Correct check for max secondary address
2024-11-03 21:26 ` [PATCH 11/11] staging: gpib: Correct check for max secondary address Dave Penkler
@ 2024-11-04 8:09 ` Dan Carpenter
0 siblings, 0 replies; 16+ messages in thread
From: Dan Carpenter @ 2024-11-04 8:09 UTC (permalink / raw)
To: Dave Penkler; +Cc: gregkh, linux-staging, linux-kernel, skhan, arnd
On Sun, Nov 03, 2024 at 10:26:17PM +0100, Dave Penkler wrote:
> GPIB secondary addresses can be between 0 and 31 inclusive
> unlike primary addresses where address 31 is not a valid device
> address. When 31 is used as a primary talk address it
> forms the UNT (Untalk) command and when used as a listener address it
> forms the UNL (Unlisten) commmand.
> The library was incorrectly not allowing a secondary address
> with a value of 31 to be used.
>
This needs a Fixes tag.
> Signed-off-by: Dave Penkler <dpenkler@gmail.com>
regards,
dan carpenter
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 10/11] staging: gpib: Re-order the lookup tables
2024-11-03 21:26 ` [PATCH 10/11] staging: gpib: Re-order the " Dave Penkler
@ 2024-11-04 8:36 ` Dan Carpenter
0 siblings, 0 replies; 16+ messages in thread
From: Dan Carpenter @ 2024-11-04 8:36 UTC (permalink / raw)
To: Dave Penkler; +Cc: gregkh, linux-staging, linux-kernel, skhan, arnd
On Sun, Nov 03, 2024 at 10:26:16PM +0100, Dave Penkler wrote:
> Re-order the tables so that the bcm27xx table is used first
> as these devices are more popular and numerous than the older ones.
>
What is the effect of this in terms of the user experience? The commit message
should be clearer about this.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 04/11] staging: gpib: Update messaging and usb_device refs in agilent_usb
2024-11-03 21:26 ` [PATCH 04/11] staging: gpib: Update messaging and usb_device refs in agilent_usb Dave Penkler
@ 2024-11-04 8:42 ` Dan Carpenter
0 siblings, 0 replies; 16+ messages in thread
From: Dan Carpenter @ 2024-11-04 8:42 UTC (permalink / raw)
To: Dave Penkler; +Cc: gregkh, linux-staging, linux-kernel, skhan, arnd
On Sun, Nov 03, 2024 at 10:26:10PM +0100, Dave Penkler wrote:
> Replace GPIB_DPRINTK with dev_dbg
> Replace pr_xxx with dev_xxx wherever possible
> Use previously initialized usb_device pointer for usb_put_dev()
>
> Signed-off-by: Dave Penkler <dpenkler@gmail.com>
> ---
> .../gpib/agilent_82357a/agilent_82357a.c | 266 ++++++++++--------
> 1 file changed, 156 insertions(+), 110 deletions(-)
>
> diff --git a/drivers/staging/gpib/agilent_82357a/agilent_82357a.c b/drivers/staging/gpib/agilent_82357a/agilent_82357a.c
> index 748aadc5cebc..68b40831b9ad 100644
> --- a/drivers/staging/gpib/agilent_82357a/agilent_82357a.c
> +++ b/drivers/staging/gpib/agilent_82357a/agilent_82357a.c
> @@ -15,11 +15,11 @@
> #include "tms9914.h"
>
> MODULE_LICENSE("GPL");
> -MODULE_DESCRIPTION("GPIB driver for Agilent 82357A/B usb adapter");
> +MODULE_DESCRIPTION("GPIB driver for Agilent 82357A/B usb adapters");
This should go in a patch by itself.
>
> #define MAX_NUM_82357A_INTERFACES 128
> static struct usb_interface *agilent_82357a_driver_interfaces[MAX_NUM_82357A_INTERFACES];
> -DEFINE_MUTEX(agilent_82357a_hotplug_lock);
> +DEFINE_MUTEX(agilent_82357a_hotplug_lock); // protect board insertion and removal
This too.
>
> static unsigned int agilent_82357a_update_status(gpib_board_t *board, unsigned int clear_mask);
>
> @@ -29,9 +29,6 @@ static void agilent_82357a_bulk_complete(struct urb *urb)
> {
> struct agilent_82357a_urb_ctx *context = urb->context;
>
> -// printk("debug: %s: status=0x%x, error_count=%i, actual_length=%i\n", __func__,
> -// urb->status, urb->error_count, urb->actual_length);
> -
> up(&context->complete);
> }
>
> @@ -80,16 +77,17 @@ static int agilent_82357a_send_bulk_msg(struct agilent_82357a_priv *a_priv, void
> if (timeout_msecs)
> mod_timer(&a_priv->bulk_timer, jiffies + msecs_to_jiffies(timeout_msecs));
>
> - //printk("%s: submitting urb\n", __func__);
> + //dev_dbg(&usb_dev->dev, "%s: submitting urb\n", __func__);
Just delete this.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH 05/11] staging: gpib: Remove GPIB_DEBUG reference and update messaging
2024-11-03 21:26 ` [PATCH 05/11] staging: gpib: Remove GPIB_DEBUG reference and update messaging Dave Penkler
@ 2024-11-04 8:43 ` Dan Carpenter
0 siblings, 0 replies; 16+ messages in thread
From: Dan Carpenter @ 2024-11-04 8:43 UTC (permalink / raw)
To: Dave Penkler; +Cc: gregkh, linux-staging, linux-kernel, skhan, arnd
On Sun, Nov 03, 2024 at 10:26:11PM +0100, Dave Penkler wrote:
> Change pr_alert to dev_alert
>
> Signed-off-by: Dave Penkler <dpenkler@gmail.com>
> ---
> .../gpib/lpvo_usb_gpib/lpvo_usb_gpib.c | 69 +++++++++----------
> 1 file changed, 34 insertions(+), 35 deletions(-)
>
> 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 4c580137043f..796c3a5be545 100644
> --- a/drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c
> +++ b/drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c
> @@ -68,11 +68,8 @@ MODULE_DEVICE_TABLE(usb, skel_table);
> * At module loading: modprobe lpvo_usb_gpib debug={0,1,2}
> * On the fly: echo {0,1,2} > /sys/modules/lpvo_usb_gpib/parameters/debug
> */
> -#ifdef GPIB_DEBUG
> -static int debug = 1;
> -#else
> +
> static int debug;
> -#endif
> module_param(debug, int, 0644);
>
Put this in patch #2 instead.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2024-11-04 8:43 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-03 21:26 [PATCH v2 00/11] staging: gpib: Patch set for gpib staging drivers Dave Penkler
2024-11-03 21:26 ` [PATCH 01/11] staging: gpib: Fix buffer overflow in ni_usb_init Dave Penkler
2024-11-03 21:26 ` [PATCH 02/11] staging: gpib: Replace custom debug with dev_dbg Dave Penkler
2024-11-03 21:26 ` [PATCH 03/11] staging: gpib: Update messaging and usb_device refs in ni_usb Dave Penkler
2024-11-03 21:26 ` [PATCH 04/11] staging: gpib: Update messaging and usb_device refs in agilent_usb Dave Penkler
2024-11-04 8:42 ` Dan Carpenter
2024-11-03 21:26 ` [PATCH 05/11] staging: gpib: Remove GPIB_DEBUG reference and update messaging Dave Penkler
2024-11-04 8:43 ` Dan Carpenter
2024-11-03 21:26 ` [PATCH 06/11] staging: gpib: Use dev_xxx for messaging Dave Penkler
2024-11-03 21:26 ` [PATCH 07/11] staging: gpib: Fix Kconfig Dave Penkler
2024-11-03 21:26 ` [PATCH 08/11] staging: gpib: Remove unneeded lookup table Dave Penkler
2024-11-03 21:26 ` [PATCH 09/11] staging: gpib: Remove GPIO14 and GPIO15 lines in lookup tables Dave Penkler
2024-11-03 21:26 ` [PATCH 10/11] staging: gpib: Re-order the " Dave Penkler
2024-11-04 8:36 ` Dan Carpenter
2024-11-03 21:26 ` [PATCH 11/11] staging: gpib: Correct check for max secondary address Dave Penkler
2024-11-04 8:09 ` Dan Carpenter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).