From nobody Thu Mar 13 11:29:40 2025 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 50707265CD9 for ; Fri, 14 Feb 2025 11:47:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739533680; cv=none; b=Va1DUxM/4rvb7tLLtR0eHh+GWGHnIQdHdms/UB2IgTO6tHc1Uw1cRKow0BUzasCzgNNLP4H26WI1aAE2ZBX8G90F870bZAGaZWwYz5j6UnaBjNqLGUXTogL0iQsjfV9r6/nVnMSczagU2XwUR3ByyzFD5ecoJWKjmXt82oky9l0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739533680; c=relaxed/simple; bh=XDjCG+xC8Hhqd2RevV7UDq3m2qTqBMUWeigtWhRaXf0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WPk8SzxCkdLsL/PwZLT8fVZcg6+KIKyN4iJSRAhqk3OHMYfUAoQmBl4N/SAOJC6XQjDq6AvlSeNNT2cwqx9x5vZi4yiFLkl4V/h7dyFBoQ6lp6VXPD9u9swmKkO/1HbQlxMfux0JB2xEATPT1E6VXQj5sfiM18I3m/4Q9wAzTR4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=BinMQ2gM; arc=none smtp.client-ip=209.85.128.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BinMQ2gM" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-43932b9b09aso21399775e9.3 for ; Fri, 14 Feb 2025 03:47:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739533673; x=1740138473; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Z89zjSaBBCkQ8S+jsfP4p5mZUXATGzK3nFSoAS76xJo=; b=BinMQ2gM6Z8sVbXUoX00iI6sPuMVxJ+nixNisTCvuPN3vQQc2cpR9lUOR1ChhGoFVr Ida5qKDgAp0STCYTKe1RwppXl4Q3GHkG6L4jT9STe+Lu042BDOkyH9DcBk/UNiUHFXoO 5quN3q9lw1f3hoWUs12llqd5khMhyU0syuRYd7JU71m9VTZoHyCb4Y8Gv8fy2kHv80QF sFM5GbVJ9NK7y0VkoF92CW2BniSAvTE0Qwj6PLCULiBLz7mWejJQia9F9hMF27p84LB4 ALAxPdL4yX5Cx0Z46Z1S2oqsffrVlgyqZ/p18d1rL25PAqHFm3Tnt1sP0z7J3DJQzEdk 1EmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739533673; x=1740138473; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Z89zjSaBBCkQ8S+jsfP4p5mZUXATGzK3nFSoAS76xJo=; b=mu66YeDJIvBQpnt7t+UvBRZaczSwR9bfa9iOY9eurUu4Yt3+U49NgC0uA9CkUHE0hx Dnce1EagJmeL6Sr/AqhS6LDGbsQHQE/t6nqBOOqf7W2UpHox4q/CyuNLllyqQPGtEy8Q +qNAkE6LBdbWbwgERxrhaPsGClERIpsoGvDIvOQqjMfsXmp0ZaEJHgk3gfbviSdRQsMT JdzE3h3Bovw4g51mdpDW1+bNZ1cHDT9+Nhq+664K0qte6xywXvRXb138W+biMQwJcdgp uz3YEdmumCYfx+VLi0TmZsPiRuqIwdpXGjMkOgj51q63H8zkZE3Ez0qYC49olbiAqxnK uedQ== X-Forwarded-Encrypted: i=1; AJvYcCWkOJZpDsdOqp4bSylAVpN0EEq2lomJuhhJn8lynyah98nMa96IEi74Gv78aFNpPssFjM1x4lFdOVZdYwY=@vger.kernel.org X-Gm-Message-State: AOJu0YxLqLpWcSK7bLBDXOH1ePKH7xtfdFCdtiU/dJ/jcYq5mIricug8 N+IUYcpvWTreNAyuP97nZJNhK5mECJG3IlX0Fk+WawSbeX3Obk1t X-Gm-Gg: ASbGncvqZIV5/hJcf/sqEm1vlCaIsZwrJ4yE/HssdBO3sTSH8c9gPxNrFe7IeV1Sxji 9d0dbiQtR9RX/GujTdjfokrLBdDzdDGdbJuZyW/a1zf7iEwEjD/ct630KQr+taCs8J22ONsLBez EQSqYg/8XLZrxQId1T+TxTk8nQHP7s5OOwrYgcIPlnfigosBU04izqzeQymrTiyBbZia+O5aprj ef/J0HUgQFYZLEoPaF0h7BGpqsKQ20596BtrsghVQPSUHLQ55VYCXrNrAC1rt3kPVfUZQopTkRt eeUlAhOn388SgQk5o9wFz4jFbhkHLqv0sBMyoL4tYUu8kSRrEDo= X-Google-Smtp-Source: AGHT+IHRYPcK8QibNQ/Qa6GC3wLsq/PFyZNCzunhB8sx4UNkV5XHJzSsT2+Q6Qkh46IghiU3J9oQlw== X-Received: by 2002:a05:600c:4f4d:b0:439:3d5c:8c19 with SMTP id 5b1f17b1804b1-439601b7ef9mr92730855e9.24.1739533671772; Fri, 14 Feb 2025 03:47:51 -0800 (PST) Received: from localhost.localdomain (82-64-73-52.subs.proxad.net. [82.64.73.52]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-439617fccfesm41945245e9.11.2025.02.14.03.47.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Feb 2025 03:47:50 -0800 (PST) From: Dave Penkler To: gregkh@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Dave Penkler Subject: [PATCH 14/17] staging: gpib: ni_usb console messaging cleanup Date: Fri, 14 Feb 2025 12:47:05 +0100 Message-ID: <20250214114708.28947-15-dpenkler@gmail.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250214114708.28947-1-dpenkler@gmail.com> References: <20250214114708.28947-1-dpenkler@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Enable module name to be printed in pr_xxx and dev_xxx Use DRV_NAME defined as KBUILD_MODNAME instead of hard coded string "ni_usb_gpib" in usb_driver struct. Remove __func__ parameter from pr_err and dev_err. Remove __func__ parameter from dev_dbg as this can be enabled by dynamic debug. Remove commented printk's and dev_err's. Remove kmalloc failed messages. Remove buffer over run bug dev_err message as this just checks for a bug in the driver which does not exist. Remove read/write length too long messages and return -EINVAL Change dev_info to dev_dbg where possible. Move attach message to the end of attach function. Remove buffer overrun message. Use actual array indeces instead of i and i++ to make code clear and check redundnant. Remove module init and exit pr_info's. Signed-off-by: Dave Penkler --- drivers/staging/gpib/ni_usb/ni_usb_gpib.c | 425 ++++++++++------------ 1 file changed, 189 insertions(+), 236 deletions(-) diff --git a/drivers/staging/gpib/ni_usb/ni_usb_gpib.c b/drivers/staging/gp= ib/ni_usb/ni_usb_gpib.c index d0656dc520f5..52c7530f07bb 100644 --- a/drivers/staging/gpib/ni_usb/ni_usb_gpib.c +++ b/drivers/staging/gpib/ni_usb/ni_usb_gpib.c @@ -5,6 +5,10 @@ * copyright : (C) 2004 by Frank Mori Hess *************************************************************************= **/ =20 +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#define dev_fmt pr_fmt +#define DRV_NAME KBUILD_MODNAME + #include #include #include @@ -75,7 +79,7 @@ static unsigned short ni_usb_timeout_code(unsigned int us= ec) */ else if (usec <=3D 1000000000) return 0x02; - pr_err("%s: bug? usec is greater than 1e9\n", __func__); + pr_err("bug? usec is greater than 1e9\n"); return 0xf0; } =20 @@ -83,8 +87,6 @@ static void ni_usb_bulk_complete(struct urb *urb) { struct ni_usb_urb_ctx *context =3D urb->context; =20 -// printk("debug: %s: status=3D0x%x, error_count=3D%i, actual_length=3D%i\= n", __func__, -// urb->status, urb->error_count, urb->actual_length); complete(&context->complete); } =20 @@ -137,8 +139,8 @@ static int ni_usb_nonblocking_send_bulk_msg(struct ni_u= sb_priv *ni_priv, void *d del_timer_sync(&ni_priv->bulk_timer); usb_free_urb(ni_priv->bulk_urb); ni_priv->bulk_urb =3D NULL; - dev_err(&usb_dev->dev, "%s: failed to submit bulk out urb, retval=3D%i\n= ", - __func__, retval); + dev_err(&usb_dev->dev, "failed to submit bulk out urb, retval=3D%i\n", + retval); mutex_unlock(&ni_priv->bulk_transfer_lock); return retval; } @@ -146,7 +148,7 @@ static int ni_usb_nonblocking_send_bulk_msg(struct ni_u= sb_priv *ni_priv, void *d wait_for_completion(&context->complete); // wait for ni_usb_bulk_compl= ete if (context->timed_out) { usb_kill_urb(ni_priv->bulk_urb); - dev_err(&usb_dev->dev, "%s: killed urb due to timeout\n", __func__); + dev_err(&usb_dev->dev, "killed urb due to timeout\n"); retval =3D -ETIMEDOUT; } else { retval =3D ni_priv->bulk_urb->status; @@ -218,14 +220,12 @@ static int ni_usb_nonblocking_receive_bulk_msg(struct= ni_usb_priv *ni_priv, if (timeout_msecs) mod_timer(&ni_priv->bulk_timer, jiffies + msecs_to_jiffies(timeout_msecs= )); =20 - //printk("%s: submitting urb\n", __func__); retval =3D 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 =3D NULL; - dev_err(&usb_dev->dev, "%s: failed to submit bulk out urb, retval=3D%i\n= ", - __func__, retval); + dev_err(&usb_dev->dev, "failed to submit bulk in urb, retval=3D%i\n", re= tval); mutex_unlock(&ni_priv->bulk_transfer_lock); return retval; } @@ -250,7 +250,7 @@ static int ni_usb_nonblocking_receive_bulk_msg(struct n= i_usb_priv *ni_priv, } if (context->timed_out) { usb_kill_urb(ni_priv->bulk_urb); - dev_err(&usb_dev->dev, "%s: killed urb due to timeout\n", __func__); + dev_err(&usb_dev->dev, "killed urb due to timeout\n"); retval =3D -ETIMEDOUT; } else { if (ni_priv->bulk_urb->status) @@ -330,14 +330,14 @@ static void ni_usb_soft_update_status(gpib_board_t *b= oard, unsigned int ni_usb_i ni_priv->monitored_ibsta_bits &=3D ~ni_usb_ibsta; need_monitoring_bits &=3D ~ni_priv->monitored_ibsta_bits; /* mm - monitor= ed set */ spin_unlock_irqrestore(&board->spinlock, flags); - dev_dbg(&usb_dev->dev, "%s: need_monitoring_bits=3D0x%x\n", __func__, nee= d_monitoring_bits); + dev_dbg(&usb_dev->dev, "need_monitoring_bits=3D0x%x\n", need_monitoring_b= its); =20 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); =20 - dev_dbg(&usb_dev->dev, "%s: ni_usb_ibsta=3D0x%x\n", __func__, ni_usb_ibst= a); + dev_dbg(&usb_dev->dev, "ibsta=3D0x%x\n", ni_usb_ibsta); } =20 static int ni_usb_parse_status_block(const u8 *buffer, struct ni_usb_statu= s_block *status) @@ -371,7 +371,7 @@ static int ni_usb_parse_register_read_block(const u8 *r= aw_data, unsigned int *re int k; =20 if (raw_data[i++] !=3D NIUSB_REGISTER_READ_DATA_START_ID) { - pr_err("%s: parse error: wrong start id\n", __func__); + pr_err("parse error: wrong start id\n"); unexpected =3D 1; } for (k =3D 0; k < results_per_chunk && j < num_results; ++k) @@ -380,18 +380,18 @@ static int ni_usb_parse_register_read_block(const u8 = *raw_data, unsigned int *re while (i % 4) i++; if (raw_data[i++] !=3D NIUSB_REGISTER_READ_DATA_END_ID) { - pr_err("%s: parse error: wrong end id\n", __func__); + pr_err("parse error: wrong end id\n"); unexpected =3D 1; } if (raw_data[i++] % results_per_chunk !=3D num_results % results_per_chun= k) { - pr_err("%s: parse error: wrong count=3D%i for NIUSB_REGISTER_READ_DATA_E= ND\n", - __func__, (int)raw_data[i - 1]); + pr_err("parse error: wrong count=3D%i for NIUSB_REGISTER_READ_DATA_END\n= ", + (int)raw_data[i - 1]); unexpected =3D 1; } while (i % 4) { if (raw_data[i++] !=3D 0) { - pr_err("%s: unexpected data: raw_data[%i]=3D0x%x, expected 0\n", - __func__, i - 1, (int)raw_data[i - 1]); + pr_err("unexpected data: raw_data[%i]=3D0x%x, expected 0\n", + i - 1, (int)raw_data[i - 1]); unexpected =3D 1; } } @@ -408,9 +408,8 @@ static int ni_usb_parse_termination_block(const u8 *buf= fer) buffer[i++] !=3D 0x0 || buffer[i++] !=3D 0x0 || buffer[i++] !=3D 0x0) { - pr_err("%s: received unexpected termination block\n", __func__); - pr_err(" expected: 0x%x 0x%x 0x%x 0x%x\n", - NIUSB_TERM_ID, 0x0, 0x0, 0x0); + pr_err("received unexpected termination block\n"); + pr_err(" expected: 0x%x 0x%x 0x%x 0x%x\n", NIUSB_TERM_ID, 0x0, 0x0, 0x0); pr_err(" received: 0x%x 0x%x 0x%x 0x%x\n", buffer[i - 4], buffer[i - 3], buffer[i - 2], buffer[i - 1]); } @@ -438,12 +437,12 @@ static int parse_board_ibrd_readback(const u8 *raw_da= ta, struct ni_usb_status_bl } else if (raw_data[i] =3D=3D NIUSB_IBRD_EXTENDED_DATA_ID) { data_block_length =3D ibrd_extended_data_block_length; if (raw_data[++i] !=3D 0) { - pr_err("%s: unexpected data: raw_data[%i]=3D0x%x, expected 0\n", - __func__, i, (int)raw_data[i]); + pr_err("unexpected data: raw_data[%i]=3D0x%x, expected 0\n", + i, (int)raw_data[i]); unexpected =3D 1; } } else { - pr_err("%s: logic bug!\n", __func__); + pr_err("Unexpected NIUSB_IBRD ID\n"); return -EINVAL; } ++i; @@ -457,7 +456,7 @@ static int parse_board_ibrd_readback(const u8 *raw_data= , struct ni_usb_status_bl } i +=3D ni_usb_parse_status_block(&raw_data[i], status); if (status->id !=3D NIUSB_IBRD_STATUS_ID) { - pr_err("%s: bug: status->id=3D%i, !=3D ibrd_status_id\n", __func__, stat= us->id); + pr_err("bug: status->id=3D%i, !=3D ibrd_status_id\n", status->id); return -EIO; } adr1_bits =3D raw_data[i++]; @@ -468,29 +467,28 @@ static int parse_board_ibrd_readback(const u8 *raw_da= ta, struct ni_usb_status_bl *actual_bytes_read =3D 0; } if (*actual_bytes_read > j) - pr_err("%s: bug: discarded data. actual_bytes_read=3D%i, j=3D%i\n", - __func__, *actual_bytes_read, j); + pr_err("bug: discarded data. actual_bytes_read=3D%i, j=3D%i\n", *actual_= bytes_read, j); for (k =3D 0; k < 2; k++) if (raw_data[i++] !=3D 0) { - pr_err("%s: unexpected data: raw_data[%i]=3D0x%x, expected 0\n", - __func__, i - 1, (int)raw_data[i - 1]); + pr_err("unexpected data: raw_data[%i]=3D0x%x, expected 0\n", + i - 1, (int)raw_data[i - 1]); unexpected =3D 1; } i +=3D ni_usb_parse_status_block(&raw_data[i], ®ister_write_status); if (register_write_status.id !=3D NIUSB_REG_WRITE_ID) { - pr_err("%s: unexpected data: register write status id=3D0x%x, expected 0= x%x\n", - __func__, register_write_status.id, NIUSB_REG_WRITE_ID); + pr_err("unexpected data: register write status id=3D0x%x, expected 0x%x\= n", + register_write_status.id, NIUSB_REG_WRITE_ID); unexpected =3D 1; } if (raw_data[i++] !=3D 2) { - pr_err("%s: unexpected data: register write count=3D%i, expected 2\n", - __func__, (int)raw_data[i - 1]); + pr_err("unexpected data: register write count=3D%i, expected 2\n", + (int)raw_data[i - 1]); unexpected =3D 1; } for (k =3D 0; k < 3; k++) if (raw_data[i++] !=3D 0) { - pr_err("%s: unexpected data: raw_data[%i]=3D0x%x, expected 0\n", - __func__, i - 1, (int)raw_data[i - 1]); + pr_err("unexpected data: raw_data[%i]=3D0x%x, expected 0\n", + i - 1, (int)raw_data[i - 1]); unexpected =3D 1; } i +=3D ni_usb_parse_termination_block(&raw_data[i]); @@ -530,18 +528,14 @@ static int ni_usb_write_registers(struct ni_usb_priv = *ni_priv, =20 out_data_length =3D num_writes * bytes_per_write + 0x10; out_data =3D kmalloc(out_data_length, GFP_KERNEL); - if (!out_data) { - dev_err(&usb_dev->dev, "%s: kmalloc failed\n", __func__); + if (!out_data) return -ENOMEM; - } i +=3D ni_usb_bulk_register_write_header(&out_data[i], num_writes); for (j =3D 0; j < num_writes; j++) i +=3D ni_usb_bulk_register_write(&out_data[i], writes[j]); while (i % 4) out_data[i++] =3D 0x00; i +=3D ni_usb_bulk_termination(&out_data[i]); - if (i > out_data_length) - dev_err(&usb_dev->dev, "%s: bug! buffer overrun\n", __func__); =20 mutex_lock(&ni_priv->addressed_transfer_lock); =20 @@ -549,22 +543,21 @@ static int ni_usb_write_registers(struct ni_usb_priv = *ni_priv, kfree(out_data); if (retval) { mutex_unlock(&ni_priv->addressed_transfer_lock); - dev_err(&usb_dev->dev, "%s: ni_usb_send_bulk_msg returned %i, bytes_writ= ten=3D%i, i=3D%i\n", - __func__, retval, bytes_written, i); + dev_err(&usb_dev->dev, "send_bulk_msg returned %i, bytes_written=3D%i, i= =3D%i\n", + retval, bytes_written, i); return retval; } =20 in_data =3D kmalloc(in_data_length, GFP_KERNEL); if (!in_data) { mutex_unlock(&ni_priv->addressed_transfer_lock); - dev_err(&usb_dev->dev, "%s: kmalloc failed\n", __func__); return -ENOMEM; } retval =3D ni_usb_receive_bulk_msg(ni_priv, in_data, in_data_length, &byt= es_read, 1000, 0); if (retval || bytes_read !=3D 16) { mutex_unlock(&ni_priv->addressed_transfer_lock); - dev_err(&usb_dev->dev, "%s: ni_usb_receive_bulk_msg returned %i, bytes_r= ead=3D%i\n", - __func__, retval, bytes_read); + dev_err(&usb_dev->dev, "receive_bulk_msg returned %i, bytes_read=3D%i\n", + retval, bytes_read); ni_usb_dump_raw_block(in_data, bytes_read); kfree(in_data); return retval; @@ -576,18 +569,16 @@ 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 !=3D NIUSB_REG_WRITE_ID) { - dev_err(&usb_dev->dev, "%s: parse error, id=3D0x%x !=3D NIUSB_REG_WRITE_= ID\n", - __func__, status.id); + dev_err(&usb_dev->dev, "parse error, id=3D0x%x !=3D NIUSB_REG_WRITE_ID\n= ", status.id); return -EIO; } if (status.error_code) { - dev_err(&usb_dev->dev, "%s: nonzero error code 0x%x\n", - __func__, status.error_code); + dev_err(&usb_dev->dev, "nonzero error code 0x%x\n", status.error_code); return -EIO; } if (reg_writes_completed !=3D num_writes) { - dev_err(&usb_dev->dev, "%s: reg_writes_completed=3D%i, num_writes=3D%i\n= ", - __func__, reg_writes_completed, num_writes); + dev_err(&usb_dev->dev, "reg_writes_completed=3D%i, num_writes=3D%i\n", + reg_writes_completed, num_writes); return -EIO; } if (ibsta) @@ -614,10 +605,8 @@ static int ni_usb_read(gpib_board_t *board, uint8_t *b= uffer, size_t length, struct ni_usb_register reg; =20 *bytes_read =3D 0; - if (length > max_read_length) { - length =3D max_read_length; - dev_err(&usb_dev->dev, "%s: read length too long\n", __func__); - } + if (length > max_read_length) + return -EINVAL; out_data =3D kmalloc(out_data_length, GFP_KERNEL); if (!out_data) return -ENOMEM; @@ -649,8 +638,8 @@ static int ni_usb_read(gpib_board_t *board, uint8_t *bu= ffer, size_t length, if (retval || usb_bytes_written !=3D i) { if (retval =3D=3D 0) retval =3D -EIO; - dev_err(&usb_dev->dev, "%s: ni_usb_send_bulk_msg returned %i, usb_bytes_= written=3D%i, i=3D%i\n", - __func__, retval, usb_bytes_written, i); + dev_err(&usb_dev->dev, "send_bulk_msg returned %i, usb_bytes_written=3D%= i, i=3D%i\n", + retval, usb_bytes_written, i); mutex_unlock(&ni_priv->addressed_transfer_lock); return retval; } @@ -668,8 +657,8 @@ static int ni_usb_read(gpib_board_t *board, uint8_t *bu= ffer, size_t length, =20 if (retval =3D=3D -ERESTARTSYS) { } else if (retval) { - dev_err(&usb_dev->dev, "%s: ni_usb_receive_bulk_msg returned %i, usb_byt= es_read=3D%i\n", - __func__, retval, usb_bytes_read); + dev_err(&usb_dev->dev, "receive_bulk_msg returned %i, usb_bytes_read=3D%= i\n", + retval, usb_bytes_read); kfree(in_data); return retval; } @@ -677,14 +666,14 @@ static int ni_usb_read(gpib_board_t *board, uint8_t *= buffer, size_t length, if (parse_retval !=3D usb_bytes_read) { if (parse_retval >=3D 0) parse_retval =3D -EIO; - dev_err(&usb_dev->dev, "%s: retval=3D%i usb_bytes_read=3D%i\n", - __func__, parse_retval, usb_bytes_read); + dev_err(&usb_dev->dev, "retval=3D%i usb_bytes_read=3D%i\n", + parse_retval, usb_bytes_read); kfree(in_data); return parse_retval; } if (actual_length !=3D length - status.count) { - dev_err(&usb_dev->dev, "%s: actual_length=3D%i expected=3D%li\n", - __func__, actual_length, (long)(length - status.count)); + dev_err(&usb_dev->dev, "actual_length=3D%i expected=3D%li\n", + actual_length, (long)(length - status.count)); ni_usb_dump_raw_block(in_data, usb_bytes_read); } kfree(in_data); @@ -699,7 +688,7 @@ static int ni_usb_read(gpib_board_t *board, uint8_t *bu= ffer, size_t length, break; case NIUSB_ATN_STATE_ERROR: retval =3D -EIO; - dev_err(&usb_dev->dev, "%s: read when ATN set\n", __func__); + dev_err(&usb_dev->dev, "read when ATN set\n"); break; case NIUSB_ADDRESSING_ERROR: retval =3D -EIO; @@ -708,12 +697,11 @@ static int ni_usb_read(gpib_board_t *board, uint8_t *= buffer, size_t length, retval =3D -ETIMEDOUT; break; case NIUSB_EOSMODE_ERROR: - dev_err(&usb_dev->dev, "%s: driver bug, we should have been able to avoi= d NIUSB_EOSMODE_ERROR.\n", - __func__); + dev_err(&usb_dev->dev, "driver bug, we should have been able to avoid NI= USB_EOSMODE_ERROR.\n"); retval =3D -EINVAL; break; default: - dev_err(&usb_dev->dev, "%s: unknown error code=3D%i\n", __func__, status= .error_code); + dev_err(&usb_dev->dev, "unknown error code=3D%i\n", status.error_code); retval =3D -EIO; break; } @@ -742,11 +730,8 @@ static int ni_usb_write(gpib_board_t *board, uint8_t *= buffer, size_t length, static const int max_write_length =3D 0xffff; =20 *bytes_written =3D 0; - if (length > max_write_length) { - length =3D max_write_length; - send_eoi =3D 0; - dev_err(&usb_dev->dev, "%s: write length too long\n", __func__); - } + if (length > max_write_length) + return -EINVAL; out_data_length =3D length + 0x10; out_data =3D kmalloc(out_data_length, GFP_KERNEL); if (!out_data) @@ -777,8 +762,8 @@ static int ni_usb_write(gpib_board_t *board, uint8_t *b= uffer, size_t length, kfree(out_data); if (retval || usb_bytes_written !=3D i) { mutex_unlock(&ni_priv->addressed_transfer_lock); - dev_err(&usb_dev->dev, "%s: ni_usb_send_bulk_msg returned %i, usb_bytes_= written=3D%i, i=3D%i\n", - __func__, retval, usb_bytes_written, i); + dev_err(&usb_dev->dev, "send_bulk_msg returned %i, usb_bytes_written=3D%= i, i=3D%i\n", + retval, usb_bytes_written, i); return retval; } =20 @@ -793,8 +778,8 @@ static int ni_usb_write(gpib_board_t *board, uint8_t *b= uffer, size_t length, mutex_unlock(&ni_priv->addressed_transfer_lock); =20 if ((retval && retval !=3D -ERESTARTSYS) || usb_bytes_read !=3D 12) { - dev_err(&usb_dev->dev, "%s: ni_usb_receive_bulk_msg returned %i, usb_byt= es_read=3D%i\n", - __func__, retval, usb_bytes_read); + dev_err(&usb_dev->dev, "receive_bulk_msg returned %i, usb_bytes_read=3D%= i\n", + retval, usb_bytes_read); kfree(in_data); return retval; } @@ -810,8 +795,8 @@ static int ni_usb_write(gpib_board_t *board, uint8_t *b= uffer, size_t length, */ break; case NIUSB_ADDRESSING_ERROR: - dev_err(&usb_dev->dev, "%s: Addressing error retval %d error code=3D%i\n= ", - __func__, retval, status.error_code); + dev_err(&usb_dev->dev, "Addressing error retval %d error code=3D%i\n", + retval, status.error_code); retval =3D -ENXIO; break; case NIUSB_NO_LISTENER_ERROR: @@ -821,8 +806,7 @@ static int ni_usb_write(gpib_board_t *board, uint8_t *b= uffer, size_t length, retval =3D -ETIMEDOUT; break; default: - dev_err(&usb_dev->dev, "%s: unknown error code=3D%i\n", - __func__, status.error_code); + dev_err(&usb_dev->dev, "unknown error code=3D%i\n", status.error_code); retval =3D -EPIPE; break; } @@ -873,8 +857,8 @@ static int ni_usb_command_chunk(gpib_board_t *board, ui= nt8_t *buffer, size_t len kfree(out_data); if (retval || bytes_written !=3D i) { mutex_unlock(&ni_priv->addressed_transfer_lock); - dev_err(&usb_dev->dev, "%s: ni_usb_send_bulk_msg returned %i, bytes_writ= ten=3D%i, i=3D%i\n", - __func__, retval, bytes_written, i); + dev_err(&usb_dev->dev, "send_bulk_msg returned %i, bytes_written=3D%i, i= =3D%i\n", + retval, bytes_written, i); return retval; } =20 @@ -890,8 +874,8 @@ static int ni_usb_command_chunk(gpib_board_t *board, ui= nt8_t *buffer, size_t len mutex_unlock(&ni_priv->addressed_transfer_lock); =20 if ((retval && retval !=3D -ERESTARTSYS) || bytes_read !=3D 12) { - dev_err(&usb_dev->dev, "%s: ni_usb_receive_bulk_msg returned %i, bytes_r= ead=3D%i\n", - __func__, retval, bytes_read); + dev_err(&usb_dev->dev, "receive_bulk_msg returned %i, bytes_read=3D%i\n", + retval, bytes_read); kfree(in_data); return retval; } @@ -909,12 +893,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: - dev_err(&usb_dev->dev, "%s: got eosmode error. Driver bug?\n", __func__); + dev_err(&usb_dev->dev, "got eosmode error. Driver bug?\n"); return -EIO; case NIUSB_TIMEOUT_ERROR: return -ETIMEDOUT; default: - dev_err(&usb_dev->dev, "%s: unknown error code=3D%i\n", __func__, status= .error_code); + dev_err(&usb_dev->dev, "unknown error code=3D%i\n", status.error_code); return -EIO; } ni_usb_soft_update_status(board, status.ibsta, 0); @@ -968,15 +952,14 @@ static int ni_usb_take_control(gpib_board_t *board, i= nt synchronous) kfree(out_data); if (retval || bytes_written !=3D i) { mutex_unlock(&ni_priv->addressed_transfer_lock); - dev_err(&usb_dev->dev, "%s: ni_usb_send_bulk_msg returned %i, bytes_writ= ten=3D%i, i=3D%i\n", - __func__, retval, bytes_written, i); + dev_err(&usb_dev->dev, "send_bulk_msg returned %i, bytes_written=3D%i, i= =3D%i\n", + retval, bytes_written, i); return retval; } =20 in_data =3D kmalloc(in_data_length, GFP_KERNEL); if (!in_data) { mutex_unlock(&ni_priv->addressed_transfer_lock); - dev_err(&usb_dev->dev, "%s: kmalloc failed\n", __func__); return -ENOMEM; } retval =3D ni_usb_receive_bulk_msg(ni_priv, in_data, in_data_length, &byt= es_read, 1000, 1); @@ -986,8 +969,8 @@ static int ni_usb_take_control(gpib_board_t *board, int= synchronous) if ((retval && retval !=3D -ERESTARTSYS) || bytes_read !=3D 12) { if (retval =3D=3D 0) retval =3D -EIO; - dev_err(&usb_dev->dev, "%s: ni_usb_receive_bulk_msg returned %i, bytes_r= ead=3D%i\n", - __func__, retval, bytes_read); + dev_err(&usb_dev->dev, "receive_bulk_msg returned %i, bytes_read=3D%i\n", + retval, bytes_read); kfree(in_data); return retval; } @@ -1025,15 +1008,14 @@ static int ni_usb_go_to_standby(gpib_board_t *board) kfree(out_data); if (retval || bytes_written !=3D i) { mutex_unlock(&ni_priv->addressed_transfer_lock); - dev_err(&usb_dev->dev, "%s: ni_usb_send_bulk_msg returned %i, bytes_writ= ten=3D%i, i=3D%i\n", - __func__, retval, bytes_written, i); + dev_err(&usb_dev->dev, "send_bulk_msg returned %i, bytes_written=3D%i, i= =3D%i\n", + retval, bytes_written, i); return retval; } =20 in_data =3D kmalloc(in_data_length, GFP_KERNEL); if (!in_data) { mutex_unlock(&ni_priv->addressed_transfer_lock); - dev_err(&usb_dev->dev, "%s: kmalloc failed\n", __func__); return -ENOMEM; } retval =3D ni_usb_receive_bulk_msg(ni_priv, in_data, in_data_length, &byt= es_read, 1000, 0); @@ -1041,16 +1023,15 @@ static int ni_usb_go_to_standby(gpib_board_t *board) mutex_unlock(&ni_priv->addressed_transfer_lock); =20 if (retval || bytes_read !=3D 12) { - dev_err(&usb_dev->dev, "%s: ni_usb_receive_bulk_msg returned %i, bytes_r= ead=3D%i\n", - __func__, retval, bytes_read); + dev_err(&usb_dev->dev, "receive_bulk_msg returned %i, bytes_read=3D%i\n", + retval, bytes_read); kfree(in_data); return retval; } ni_usb_parse_status_block(in_data, &status); kfree(in_data); if (status.id !=3D NIUSB_IBGTS_ID) - dev_err(&usb_dev->dev, "%s: bug: status.id 0x%x !=3D INUSB_IBGTS_ID\n", - __func__, status.id); + dev_err(&usb_dev->dev, "bug: status.id 0x%x !=3D INUSB_IBGTS_ID\n", stat= us.id); ni_usb_soft_update_status(board, status.ibsta, 0); return 0; } @@ -1093,7 +1074,7 @@ static void ni_usb_request_system_control(gpib_board_= t *board, int request_contr } retval =3D ni_usb_write_registers(ni_priv, writes, i, &ibsta); if (retval < 0) { - dev_err(&usb_dev->dev, "%s: register write failed, retval=3D%i\n", __fun= c__, retval); + dev_err(&usb_dev->dev, "register write failed, retval=3D%i\n", retval); return; // retval; } if (!request_control) @@ -1119,10 +1100,8 @@ static void ni_usb_interface_clear(gpib_board_t *boa= rd, int assert) if (assert =3D=3D 0) return; out_data =3D kmalloc(out_data_length, GFP_KERNEL); - if (!out_data) { - dev_err(&usb_dev->dev, "%s: kmalloc failed\n", __func__); + if (!out_data) return; - } out_data[i++] =3D NIUSB_IBSIC_ID; out_data[i++] =3D 0x0; out_data[i++] =3D 0x0; @@ -1131,8 +1110,8 @@ static void ni_usb_interface_clear(gpib_board_t *boar= d, int assert) retval =3D ni_usb_send_bulk_msg(ni_priv, out_data, i, &bytes_written, 100= 0); kfree(out_data); if (retval || bytes_written !=3D i) { - dev_err(&usb_dev->dev, "%s: ni_usb_send_bulk_msg returned %i, bytes_writ= ten=3D%i, i=3D%i\n", - __func__, retval, bytes_written, i); + dev_err(&usb_dev->dev, "send_bulk_msg returned %i, bytes_written=3D%i, i= =3D%i\n", + retval, bytes_written, i); return; } in_data =3D kmalloc(in_data_length, GFP_KERNEL); @@ -1141,8 +1120,8 @@ static void ni_usb_interface_clear(gpib_board_t *boar= d, int assert) =20 retval =3D ni_usb_receive_bulk_msg(ni_priv, in_data, in_data_length, &byt= es_read, 1000, 0); if (retval || bytes_read !=3D 12) { - dev_err(&usb_dev->dev, "%s: ni_usb_receive_bulk_msg returned %i, bytes_r= ead=3D%i\n", - __func__, retval, bytes_read); + dev_err(&usb_dev->dev, "receive_bulk_msg returned %i, bytes_read=3D%i\n", + retval, bytes_read); kfree(in_data); return; } @@ -1167,7 +1146,7 @@ static void ni_usb_remote_enable(gpib_board_t *board,= int enable) reg.value =3D AUX_CREN; retval =3D ni_usb_write_registers(ni_priv, ®, 1, &ibsta); if (retval < 0) { - dev_err(&usb_dev->dev, "%s: register write failed, retval=3D%i\n", __fun= c__, retval); + dev_err(&usb_dev->dev, "register write failed, retval=3D%i\n", retval); return; //retval; } ni_priv->ren_state =3D enable; @@ -1207,7 +1186,6 @@ static unsigned int ni_usb_update_status(gpib_board_t= *board, unsigned int clear u8 *buffer; struct ni_usb_status_block status; =20 - //printk("%s: receive control pipe is %i\n", __func__, pipe); buffer =3D kmalloc(buffer_length, GFP_KERNEL); if (!buffer) return board->status; @@ -1216,7 +1194,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 !=3D buffer_length) { - dev_err(&usb_dev->dev, "%s: usb_control_msg returned %i\n", __func__, re= tval); + dev_err(&usb_dev->dev, "usb_control_msg returned %i\n", retval); kfree(buffer); return board->status; } @@ -1235,7 +1213,6 @@ static void ni_usb_stop(struct ni_usb_priv *ni_priv) u8 *buffer; struct ni_usb_status_block status; =20 - //printk("%s: receive control pipe is %i\n", __func__, pipe); buffer =3D kmalloc(buffer_length, GFP_KERNEL); if (!buffer) return; @@ -1244,7 +1221,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 !=3D buffer_length) { - dev_err(&usb_dev->dev, "%s: usb_control_msg returned %i\n", __func__, re= tval); + dev_err(&usb_dev->dev, "usb_control_msg returned %i\n", retval); kfree(buffer); return; } @@ -1271,7 +1248,7 @@ static int ni_usb_primary_address(gpib_board_t *board= , unsigned int address) i++; retval =3D ni_usb_write_registers(ni_priv, writes, i, &ibsta); if (retval < 0) { - dev_err(&usb_dev->dev, "%s: register write failed, retval=3D%i\n", __fun= c__, retval); + dev_err(&usb_dev->dev, "register write failed, retval=3D%i\n", retval); return retval; } ni_usb_soft_update_status(board, ibsta, 0); @@ -1319,7 +1296,7 @@ static int ni_usb_secondary_address(gpib_board_t *boa= rd, unsigned int address, i i +=3D ni_usb_write_sad(writes, address, enable); retval =3D ni_usb_write_registers(ni_priv, writes, i, &ibsta); if (retval < 0) { - dev_err(&usb_dev->dev, "%s: register write failed, retval=3D%i\n", __fun= c__, retval); + dev_err(&usb_dev->dev, "register write failed, retval=3D%i\n", retval); return retval; } ni_usb_soft_update_status(board, ibsta, 0); @@ -1353,8 +1330,8 @@ static int ni_usb_parallel_poll(gpib_board_t *board, = uint8_t *result) =20 kfree(out_data); if (retval || bytes_written !=3D i) { - dev_err(&usb_dev->dev, "%s: ni_usb_send_bulk_msg returned %i, bytes_writ= ten=3D%i, i=3D%i\n", - __func__, retval, bytes_written, i); + dev_err(&usb_dev->dev, "send_bulk_msg returned %i, bytes_written=3D%i, i= =3D%i\n", + retval, bytes_written, i); return retval; } in_data =3D kmalloc(in_data_length, GFP_KERNEL); @@ -1366,8 +1343,8 @@ static int ni_usb_parallel_poll(gpib_board_t *board, = uint8_t *result) &bytes_read, 1000, 1); =20 if (retval && retval !=3D -ERESTARTSYS) { - dev_err(&usb_dev->dev, "%s: ni_usb_receive_bulk_msg returned %i, bytes_r= ead=3D%i\n", - __func__, retval, bytes_read); + dev_err(&usb_dev->dev, "receive_bulk_msg returned %i, bytes_read=3D%i\n", + retval, bytes_read); kfree(in_data); return retval; } @@ -1393,7 +1370,7 @@ static void ni_usb_parallel_poll_configure(gpib_board= _t *board, uint8_t config) i++; retval =3D ni_usb_write_registers(ni_priv, writes, i, &ibsta); if (retval < 0) { - dev_err(&usb_dev->dev, "%s: register write failed, retval=3D%i\n", __fun= c__, retval); + dev_err(&usb_dev->dev, "register write failed, retval=3D%i\n", retval); return;// retval; } ni_usb_soft_update_status(board, ibsta, 0); @@ -1418,7 +1395,7 @@ static void ni_usb_parallel_poll_response(gpib_board_= t *board, int ist) i++; retval =3D ni_usb_write_registers(ni_priv, writes, i, &ibsta); if (retval < 0) { - dev_err(&usb_dev->dev, "%s: register write failed, retval=3D%i\n", __fun= c__, retval); + dev_err(&usb_dev->dev, "register write failed, retval=3D%i\n", retval); return;// retval; } ni_usb_soft_update_status(board, ibsta, 0); @@ -1440,7 +1417,7 @@ static void ni_usb_serial_poll_response(gpib_board_t = *board, u8 status) i++; retval =3D ni_usb_write_registers(ni_priv, writes, i, &ibsta); if (retval < 0) { - dev_err(&usb_dev->dev, "%s: register write failed, retval=3D%i\n", __fun= c__, retval); + dev_err(&usb_dev->dev, "register write failed, retval=3D%i\n", retval); return;// retval; } ni_usb_soft_update_status(board, ibsta, 0); @@ -1467,7 +1444,7 @@ static void ni_usb_return_to_local(gpib_board_t *boar= d) i++; retval =3D ni_usb_write_registers(ni_priv, writes, i, &ibsta); if (retval < 0) { - dev_err(&usb_dev->dev, "%s: register write failed, retval=3D%i\n", __fun= c__, retval); + dev_err(&usb_dev->dev, "register write failed, retval=3D%i\n", retval); return;// retval; } ni_usb_soft_update_status(board, ibsta, 0); @@ -1509,15 +1486,14 @@ static int ni_usb_line_status(const gpib_board_t *b= oard) if (retval || bytes_written !=3D i) { mutex_unlock(&ni_priv->addressed_transfer_lock); if (retval !=3D -EAGAIN) - dev_err(&usb_dev->dev, "%s: ni_usb_send_bulk_msg returned %i, bytes_wri= tten=3D%i, i=3D%i\n", - __func__, retval, bytes_written, i); + dev_err(&usb_dev->dev, "send_bulk_msg returned %i, bytes_written=3D%i, = i=3D%i\n", + retval, bytes_written, i); return retval; } =20 in_data =3D kmalloc(in_data_length, GFP_KERNEL); if (!in_data) { mutex_unlock(&ni_priv->addressed_transfer_lock); - dev_err(&usb_dev->dev, "%s: kmalloc failed\n", __func__); return -ENOMEM; } retval =3D ni_usb_nonblocking_receive_bulk_msg(ni_priv, in_data, in_data_= length, @@ -1527,8 +1503,8 @@ static int ni_usb_line_status(const gpib_board_t *boa= rd) =20 if (retval) { if (retval !=3D -EAGAIN) - dev_err(&usb_dev->dev, "%s: ni_usb_receive_bulk_msg returned %i, bytes_= read=3D%i\n", - __func__, retval, bytes_read); + dev_err(&usb_dev->dev, "receive_bulk_msg returned %i, bytes_read=3D%i\n= ", + retval, bytes_read); kfree(in_data); return retval; } @@ -1604,7 +1580,7 @@ static unsigned int ni_usb_t1_delay(gpib_board_t *boa= rd, unsigned int nano_sec) i =3D ni_usb_setup_t1_delay(writes, nano_sec, &actual_ns); retval =3D ni_usb_write_registers(ni_priv, writes, i, &ibsta); if (retval < 0) { - dev_err(&usb_dev->dev, "%s: register write failed, retval=3D%i\n", __fun= c__, retval); + dev_err(&usb_dev->dev, "register write failed, retval=3D%i\n", retval); return -1; //FIXME should change return type to int for error reporting } board->t1_nano_sec =3D actual_ns; @@ -1736,7 +1712,7 @@ static int ni_usb_setup_init(gpib_board_t *board, str= uct ni_usb_register *writes writes[i].value =3D AUX_CPPF; i++; if (i > NUM_INIT_WRITES) { - dev_err(&usb_dev->dev, "%s: bug!, buffer overrun, i=3D%i\n", __func__, i= ); + dev_err(&usb_dev->dev, "bug!, buffer overrun, i=3D%i\n", i); return 0; } return i; @@ -1762,7 +1738,7 @@ static int ni_usb_init(gpib_board_t *board) return -EFAULT; kfree(writes); if (retval) { - dev_err(&usb_dev->dev, "%s: register write failed, retval=3D%i\n", __fun= c__, retval); + dev_err(&usb_dev->dev, "register write failed, retval=3D%i\n", retval); return retval; } ni_usb_soft_update_status(board, ibsta, 0); @@ -1778,9 +1754,6 @@ static void ni_usb_interrupt_complete(struct urb *urb) struct ni_usb_status_block status; unsigned long flags; =20 -// printk("debug: %s: status=3D0x%x, error_count=3D%i, actual_length=3D%i\= n", __func__, -// urb->status, urb->error_count, urb->actual_length); - switch (urb->status) { /* success */ case 0: @@ -1793,23 +1766,21 @@ static void ni_usb_interrupt_complete(struct urb *u= rb) default: /* other error, resubmit */ retval =3D usb_submit_urb(ni_priv->interrupt_urb, GFP_ATOMIC); if (retval) - dev_err(&usb_dev->dev, "%s: failed to resubmit interrupt urb\n", __func= __); + dev_err(&usb_dev->dev, "failed to resubmit interrupt urb\n"); return; } =20 ni_usb_parse_status_block(urb->transfer_buffer, &status); -// printk("debug: ibsta=3D0x%x\n", status.ibsta); =20 spin_lock_irqsave(&board->spinlock, flags); ni_priv->monitored_ibsta_bits &=3D ~status.ibsta; -// printk("debug: monitored_ibsta_bits=3D0x%x\n", ni_priv->monitored_ibsta= _bits); spin_unlock_irqrestore(&board->spinlock, flags); =20 wake_up_interruptible(&board->wait); =20 retval =3D usb_submit_urb(ni_priv->interrupt_urb, GFP_ATOMIC); if (retval) - dev_err(&usb_dev->dev, "%s: failed to resubmit interrupt urb\n", __func_= _); + dev_err(&usb_dev->dev, "failed to resubmit interrupt urb\n"); } =20 static int ni_usb_set_interrupt_monitor(gpib_board_t *board, unsigned int = monitored_bits) @@ -1821,22 +1792,20 @@ static int ni_usb_set_interrupt_monitor(gpib_board_= t *board, unsigned int monito u8 *buffer; struct ni_usb_status_block status; unsigned long flags; - //printk("%s: receive control pipe is %i\n", __func__, pipe); + buffer =3D kmalloc(buffer_length, GFP_KERNEL); if (!buffer) return -ENOMEM; =20 spin_lock_irqsave(&board->spinlock, flags); ni_priv->monitored_ibsta_bits =3D ni_usb_ibsta_monitor_mask & monitored_b= its; -// dev_err(&usb_dev->dev, "debug: %s: monitored_ibsta_bits=3D0x%x\n", -// __func__, ni_priv->monitored_ibsta_bits); spin_unlock_irqrestore(&board->spinlock, flags); retval =3D ni_usb_receive_control_msg(ni_priv, NI_USB_WAIT_REQUEST, USB_D= IR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, 0x300, ni_usb_ibsta_monitor_mask & monitored_bits, buffer, buffer_length, 1000); if (retval !=3D buffer_length) { - dev_err(&usb_dev->dev, "%s: usb_control_msg returned %i\n", __func__, re= tval); + dev_err(&usb_dev->dev, "usb_control_msg returned %i\n", retval); kfree(buffer); return -1; } @@ -1872,8 +1841,7 @@ static int ni_usb_setup_urbs(gpib_board_t *board) retval =3D usb_submit_urb(ni_priv->interrupt_urb, GFP_KERNEL); mutex_unlock(&ni_priv->interrupt_transfer_lock); if (retval) { - dev_err(&usb_dev->dev, "%s: failed to submit first interrupt urb, retval= =3D%i\n", - __func__, retval); + dev_err(&usb_dev->dev, "failed to submit first interrupt urb, retval=3D%= i\n", retval); return retval; } return 0; @@ -1904,7 +1872,6 @@ static int ni_usb_b_read_serial_number(struct ni_usb_= priv *ni_priv) int j; unsigned int serial_number; =20 -// printk("%s: %s\n", __func__); in_data =3D kmalloc(in_data_length, GFP_KERNEL); if (!in_data) return -ENOMEM; @@ -1924,20 +1891,19 @@ static int ni_usb_b_read_serial_number(struct ni_us= b_priv *ni_priv) i +=3D ni_usb_bulk_termination(&out_data[i]); retval =3D ni_usb_send_bulk_msg(ni_priv, out_data, out_data_length, &byte= s_written, 1000); if (retval) { - dev_err(&usb_dev->dev, "%s: ni_usb_send_bulk_msg returned %i, bytes_writ= ten=3D%i, i=3D%li\n", - __func__, + dev_err(&usb_dev->dev, "send_bulk_msg returned %i, bytes_written=3D%i, i= =3D%li\n", retval, bytes_written, (long)out_data_length); goto serial_out; } retval =3D ni_usb_receive_bulk_msg(ni_priv, in_data, in_data_length, &byt= es_read, 1000, 0); if (retval) { - dev_err(&usb_dev->dev, "%s: ni_usb_receive_bulk_msg returned %i, bytes_r= ead=3D%i\n", - __func__, retval, bytes_read); + dev_err(&usb_dev->dev, "receive_bulk_msg returned %i, bytes_read=3D%i\n", + retval, bytes_read); ni_usb_dump_raw_block(in_data, bytes_read); goto serial_out; } if (ARRAY_SIZE(results) < num_reads) { - dev_err(&usb_dev->dev, "Setup bug\n"); + dev_err(&usb_dev->dev, "serial number eetup bug\n"); retval =3D -EINVAL; goto serial_out; } @@ -1945,7 +1911,7 @@ static int ni_usb_b_read_serial_number(struct ni_usb_= priv *ni_priv) serial_number =3D 0; for (j =3D 0; j < num_reads; ++j) serial_number |=3D (results[j] & 0xff) << (8 * j); - dev_info(&usb_dev->dev, "%s: board serial number is 0x%x\n", __func__, se= rial_number); + dev_dbg(&usb_dev->dev, "board serial number is 0x%x\n", serial_number); retval =3D 0; serial_out: kfree(in_data); @@ -1973,22 +1939,22 @@ static int ni_usb_hs_wait_for_ready(struct ni_usb_p= riv *ni_priv) USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, 0x0, 0x0, buffer, buffer_size, 1000); if (retval < 0) { - dev_err(&usb_dev->dev, "%s: usb_control_msg request 0x%x returned %i\n", - __func__, NI_USB_SERIAL_NUMBER_REQUEST, retval); + dev_err(&usb_dev->dev, "usb_control_msg request 0x%x returned %i\n", + NI_USB_SERIAL_NUMBER_REQUEST, retval); goto ready_out; } j =3D 0; if (buffer[j] !=3D NI_USB_SERIAL_NUMBER_REQUEST) { - dev_err(&usb_dev->dev, "%s: unexpected data: buffer[%i]=3D0x%x, expected= 0x%x\n", - __func__, j, (int)buffer[j], NI_USB_SERIAL_NUMBER_REQUEST); + dev_err(&usb_dev->dev, "unexpected data: buffer[%i]=3D0x%x, expected 0x%= x\n", + j, (int)buffer[j], NI_USB_SERIAL_NUMBER_REQUEST); unexpected =3D 1; } if (unexpected) ni_usb_dump_raw_block(buffer, retval); // NI-USB-HS+ pads the serial with 0x0 to make 16 bytes if (retval !=3D 5 && retval !=3D 16) { - dev_err(&usb_dev->dev, "%s: received unexpected number of bytes =3D %i, = expected 5 or 16\n", - __func__, retval); + dev_err(&usb_dev->dev, "received unexpected number of bytes =3D %i, expe= cted 5 or 16\n", + retval); ni_usb_dump_raw_block(buffer, retval); } serial_number =3D 0; @@ -1996,7 +1962,7 @@ static int ni_usb_hs_wait_for_ready(struct ni_usb_pri= v *ni_priv) serial_number |=3D (buffer[++j] << 8); serial_number |=3D (buffer[++j] << 16); serial_number |=3D (buffer[++j] << 24); - dev_info(&usb_dev->dev, "%s: board serial number is 0x%x\n", __func__, se= rial_number); + dev_dbg(&usb_dev->dev, "board serial number is 0x%x\n", serial_number); for (i =3D 0; i < timeout; ++i) { int ready =3D 0; =20 @@ -2004,26 +1970,26 @@ static int ni_usb_hs_wait_for_ready(struct ni_usb_p= riv *ni_priv) USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, 0x0, 0x0, buffer, buffer_size, 100); if (retval < 0) { - dev_err(&usb_dev->dev, "%s: usb_control_msg request 0x%x returned %i\n", - __func__, NI_USB_POLL_READY_REQUEST, retval); + dev_err(&usb_dev->dev, "usb_control_msg request 0x%x returned %i\n", + NI_USB_POLL_READY_REQUEST, retval); goto ready_out; } j =3D 0; unexpected =3D 0; if (buffer[j] !=3D NI_USB_POLL_READY_REQUEST) { // [0] - dev_err(&usb_dev->dev, "%s: unexpected data: buffer[%i]=3D0x%x, expecte= d 0x%x\n", - __func__, j, (int)buffer[j], NI_USB_POLL_READY_REQUEST); + dev_err(&usb_dev->dev, "unexpected data: buffer[%i]=3D0x%x, expected 0x= %x\n", + j, (int)buffer[j], NI_USB_POLL_READY_REQUEST); unexpected =3D 1; } ++j; if (buffer[j] !=3D 0x1 && buffer[j] !=3D 0x0) { // [1] HS+ sends 0x0 - dev_err(&usb_dev->dev, "%s: unexpected data: buffer[%i]=3D0x%x, expecte= d 0x1 or 0x0\n", - __func__, j, (int)buffer[j]); + dev_err(&usb_dev->dev, "unexpected data: buffer[%i]=3D0x%x, expected 0x= 1 or 0x0\n", + j, (int)buffer[j]); unexpected =3D 1; } if (buffer[++j] !=3D 0x0) { // [2] - dev_err(&usb_dev->dev, "%s: unexpected data: buffer[%i]=3D0x%x, expecte= d 0x%x\n", - __func__, j, (int)buffer[j], 0x0); + dev_err(&usb_dev->dev, "unexpected data: buffer[%i]=3D0x%x, expected 0x= %x\n", + j, (int)buffer[j], 0x0); unexpected =3D 1; } ++j; @@ -2031,22 +1997,22 @@ static int ni_usb_hs_wait_for_ready(struct ni_usb_p= riv *ni_priv) // NI-USB-HS+ sends 0x0 if (buffer[j] !=3D 0x1 && buffer[j] !=3D 0x8 && buffer[j] !=3D 0x7 && bu= ffer[j] !=3D 0x0) { // [3] - dev_err(&usb_dev->dev, "%s: unexpected data: buffer[%i]=3D0x%x, expecte= d 0x0, 0x1, 0x7 or 0x8\n", - __func__, j, (int)buffer[j]); + dev_err(&usb_dev->dev, "unexpected data: buffer[%i]=3D0x%x, expected 0x= 0, 0x1, 0x7 or 0x8\n", + j, (int)buffer[j]); unexpected =3D 1; } ++j; // NI-USB-HS+ sends 0 here if (buffer[j] !=3D 0x30 && buffer[j] !=3D 0x0) { // [4] - dev_err(&usb_dev->dev, "%s: unexpected data: buffer[%i]=3D0x%x, expecte= d 0x0 or 0x30\n", - __func__, j, (int)buffer[j]); + dev_err(&usb_dev->dev, "unexpected data: buffer[%i]=3D0x%x, expected 0x= 0 or 0x30\n", + j, (int)buffer[j]); unexpected =3D 1; } ++j; // MC usb-488 (and sometimes NI-USB-HS?) and NI-USB-HS+ sends 0x0 here if (buffer[j] !=3D 0x1 && buffer[j] !=3D 0x0) { // [5] - dev_err(&usb_dev->dev, "%s: unexpected data: buffer[%i]=3D0x%x, expecte= d 0x1 or 0x0\n", - __func__, j, (int)buffer[j]); + dev_err(&usb_dev->dev, "unexpected data: buffer[%i]=3D0x%x, expected 0x= 1 or 0x0\n", + j, (int)buffer[j]); unexpected =3D 1; } if (buffer[++j] !=3D 0x0) { // [6] @@ -2054,8 +2020,8 @@ static int ni_usb_hs_wait_for_ready(struct ni_usb_pri= v *ni_priv) // NI-USB-HS+ sends 0xf here if (buffer[j] !=3D 0x2 && buffer[j] !=3D 0xe && buffer[j] !=3D 0xf && buffer[j] !=3D 0x16) { - dev_err(&usb_dev->dev, "%s: unexpected data: buffer[%i]=3D0x%x, expect= ed 0x2, 0xe, 0xf or 0x16\n", - __func__, j, (int)buffer[j]); + dev_err(&usb_dev->dev, "unexpected data: buffer[%i]=3D0x%x, expected 0= x2, 0xe, 0xf or 0x16\n", + j, (int)buffer[j]); unexpected =3D 1; } } @@ -2064,30 +2030,30 @@ static int ni_usb_hs_wait_for_ready(struct ni_usb_p= riv *ni_priv) // MC usb-488 sends 0x5 here; MC usb-488A sends 0x6 here if (buffer[j] !=3D 0x3 && buffer[j] !=3D 0x5 && buffer[j] !=3D 0x6 && buffer[j] !=3D 0x8) { - dev_err(&usb_dev->dev, "%s: unexpected data: buffer[%i]=3D0x%x, expect= ed 0x3 or 0x5, 0x6 or 0x08\n", - __func__, j, (int)buffer[j]); + dev_err(&usb_dev->dev, "unexpected data: buffer[%i]=3D0x%x, expected 0= x3 or 0x5, 0x6 or 0x08\n", + j, (int)buffer[j]); unexpected =3D 1; } } ++j; if (buffer[j] !=3D 0x0 && buffer[j] !=3D 0x2) { // [8] MC usb-488 sends = 0x2 here - dev_err(&usb_dev->dev, "%s: unexpected data: buffer[%i]=3D0x%x, expecte= d 0x0 or 0x2\n", - __func__, j, (int)buffer[j]); + dev_err(&usb_dev->dev, " unexpected data: buffer[%i]=3D0x%x, expected 0= x0 or 0x2\n", + j, (int)buffer[j]); unexpected =3D 1; } ++j; // MC usb-488A and NI-USB-HS sends 0x3 here; NI-USB-HS+ sends 0x30 here if (buffer[j] !=3D 0x0 && buffer[j] !=3D 0x3 && buffer[j] !=3D 0x30) { /= / [9] - dev_err(&usb_dev->dev, "%s: unexpected data: buffer[%i]=3D0x%x, expecte= d 0x0, 0x3 or 0x30\n", - __func__, j, (int)buffer[j]); + dev_err(&usb_dev->dev, "unexpected data: buffer[%i]=3D0x%x, expected 0x= 0, 0x3 or 0x30\n", + j, (int)buffer[j]); unexpected =3D 1; } if (buffer[++j] !=3D 0x0) { ready =3D 1; if (buffer[j] !=3D 0x96 && buffer[j] !=3D 0x7 && buffer[j] !=3D 0x6e) { // [10] MC usb-488 sends 0x7 here - dev_err(&usb_dev->dev, "%s: unexpected data: buffer[%i]=3D0x%x, expect= ed 0x96, 0x07 or 0x6e\n", - __func__, j, (int)buffer[j]); + dev_err(&usb_dev->dev, "unexpected data: buffer[%i]=3D0x%x, expected 0= x96, 0x07 or 0x6e\n", + j, (int)buffer[j]); unexpected =3D 1; } } @@ -2097,7 +2063,6 @@ static int ni_usb_hs_wait_for_ready(struct ni_usb_pri= v *ni_priv) break; retval =3D msleep_interruptible(msec_sleep_duration); if (retval) { - dev_err(&usb_dev->dev, "ni_usb_gpib: msleep interrupted\n"); retval =3D -ERESTARTSYS; goto ready_out; } @@ -2106,7 +2071,7 @@ static int ni_usb_hs_wait_for_ready(struct ni_usb_pri= v *ni_priv) =20 ready_out: kfree(buffer); - dev_dbg(&usb_dev->dev, "%s: exit retval=3D%d\n", __func__, retval); + dev_dbg(&usb_dev->dev, "exit retval=3D%d\n", retval); return retval; } =20 @@ -2134,14 +2099,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) { - dev_err(&usb_dev->dev, "%s: usb_control_msg request 0x%x returned %i\n", - __func__, NI_USB_HS_PLUS_0x48_REQUEST, retval); + dev_err(&usb_dev->dev, "usb_control_msg request 0x%x returned %i\n", + 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] !=3D NI_USB_HS_PLUS_0x48_REQUEST) - dev_err(&usb_dev->dev, "%s: unexpected data: buffer[0]=3D0x%x, expected= 0x%x\n", - __func__, (int)buffer[0], NI_USB_HS_PLUS_0x48_REQUEST); + dev_err(&usb_dev->dev, "unexpected data: buffer[0]=3D0x%x, expected 0x%= x\n", + (int)buffer[0], NI_USB_HS_PLUS_0x48_REQUEST); =20 transfer_size =3D 2; =20 @@ -2149,14 +2114,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) { - dev_err(&usb_dev->dev, "%s: usb_control_msg request 0x%x returned %i\n", - __func__, NI_USB_HS_PLUS_LED_REQUEST, retval); + dev_err(&usb_dev->dev, "usb_control_msg request 0x%x returned %i\n", + NI_USB_HS_PLUS_LED_REQUEST, retval); break; } // expected response data: 4b 00 if (buffer[0] !=3D NI_USB_HS_PLUS_LED_REQUEST) - dev_err(&usb_dev->dev, "%s: unexpected data: buffer[0]=3D0x%x, expected= 0x%x\n", - __func__, (int)buffer[0], NI_USB_HS_PLUS_LED_REQUEST); + dev_err(&usb_dev->dev, "unexpected data: buffer[0]=3D0x%x, expected 0x%= x\n", + (int)buffer[0], NI_USB_HS_PLUS_LED_REQUEST); =20 transfer_size =3D 9; =20 @@ -2165,15 +2130,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) { - dev_err(&usb_dev->dev, "%s: usb_control_msg request 0x%x returned %i\n", - __func__, NI_USB_HS_PLUS_0xf8_REQUEST, retval); + dev_err(&usb_dev->dev, "usb_control_msg request 0x%x returned %i\n", + NI_USB_HS_PLUS_0xf8_REQUEST, retval); break; } // expected response data: f8 01 00 00 00 01 00 00 00 if (buffer[0] !=3D NI_USB_HS_PLUS_0xf8_REQUEST) - dev_err(&usb_dev->dev, "%s: unexpected data: buffer[0]=3D0x%x, expected= 0x%x\n", - __func__, (int)buffer[0], NI_USB_HS_PLUS_0xf8_REQUEST); - + dev_err(&usb_dev->dev, "unexpected data: buffer[0]=3D0x%x, expected 0x%= x\n", + (int)buffer[0], NI_USB_HS_PLUS_0xf8_REQUEST); } while (0); =20 // cleanup @@ -2192,7 +2156,7 @@ static inline int ni_usb_device_match(struct usb_inte= rface *interface, static int ni_usb_attach(gpib_board_t *board, const gpib_board_config_t *c= onfig) { int retval; - int i; + int i, index; struct ni_usb_priv *ni_priv; int product_id; struct usb_device *usb_dev; @@ -2211,19 +2175,17 @@ static int ni_usb_attach(gpib_board_t *board, const= gpib_board_config_t *config) ni_priv->bus_interface =3D ni_usb_driver_interfaces[i]; usb_set_intfdata(ni_usb_driver_interfaces[i], board); usb_dev =3D interface_to_usbdev(ni_priv->bus_interface); - dev_info(&usb_dev->dev, - "bus %d dev num %d attached to gpib minor %d, NI usb interface %i\n", - usb_dev->bus->busnum, usb_dev->devnum, board->minor, i); + index =3D i; break; } } if (i =3D=3D MAX_NUM_NI_USB_INTERFACES) { mutex_unlock(&ni_usb_hotplug_lock); - pr_err("No supported NI usb gpib adapters found, have you loaded its fir= mware?\n"); + dev_err(board->gpib_dev, "No supported adapters found, have you loaded i= ts firmware?\n"); return -ENODEV; } if (usb_reset_configuration(interface_to_usbdev(ni_priv->bus_interface))) - dev_err(&usb_dev->dev, "ni_usb_gpib: usb_reset_configuration() failed.\n= "); + dev_err(&usb_dev->dev, "usb_reset_configuration() failed.\n"); =20 product_id =3D le16_to_cpu(usb_dev->descriptor.idProduct); ni_priv->product_id =3D product_id; @@ -2296,7 +2258,9 @@ static int ni_usb_attach(gpib_board_t *board, const g= pib_board_config_t *config) } =20 mutex_unlock(&ni_usb_hotplug_lock); - dev_info(&usb_dev->dev, "%s: attached\n", __func__); + dev_info(&usb_dev->dev, + "bus %d dev num %d attached to gpib%d, intf %i\n", + usb_dev->bus->busnum, usb_dev->devnum, board->minor, index); return retval; } =20 @@ -2304,27 +2268,19 @@ static int ni_usb_shutdown_hardware(struct ni_usb_p= riv *ni_priv) { struct usb_device *usb_dev =3D interface_to_usbdev(ni_priv->bus_interface= ); int retval; - int i =3D 0; struct ni_usb_register writes[2]; static const int writes_length =3D ARRAY_SIZE(writes); unsigned int ibsta; =20 -// printk("%s: %s\n", __func__); - writes[i].device =3D NIUSB_SUBDEV_TNT4882; - writes[i].address =3D nec7210_to_tnt4882_offset(AUXMR); - writes[i].value =3D AUX_CR; - i++; - writes[i].device =3D NIUSB_SUBDEV_UNKNOWN3; - writes[i].address =3D 0x10; - writes[i].value =3D 0x0; - i++; - if (i > writes_length) { - dev_err(&usb_dev->dev, "%s: bug!, buffer overrun, i=3D%i\n", __func__, i= ); - return -EINVAL; - } - retval =3D ni_usb_write_registers(ni_priv, writes, i, &ibsta); + writes[0].device =3D NIUSB_SUBDEV_TNT4882; + writes[0].address =3D nec7210_to_tnt4882_offset(AUXMR); + writes[0].value =3D AUX_CR; + writes[1].device =3D NIUSB_SUBDEV_UNKNOWN3; + writes[1].address =3D 0x10; + writes[1].value =3D 0x0; + retval =3D ni_usb_write_registers(ni_priv, writes, writes_length, &ibsta); if (retval) { - dev_err(&usb_dev->dev, "%s: register write failed, retval=3D%i\n", __fun= c__, retval); + dev_err(&usb_dev->dev, "register write failed, retval=3D%i\n", retval); return retval; } return 0; @@ -2413,7 +2369,7 @@ static int ni_usb_driver_probe(struct usb_interface *= interface, const struct usb if (i =3D=3D MAX_NUM_NI_USB_INTERFACES) { usb_put_dev(usb_dev); mutex_unlock(&ni_usb_hotplug_lock); - dev_err(&usb_dev->dev, "%s: ni_usb_driver_interfaces[] full\n", __func__= ); + dev_err(&usb_dev->dev, "ni_usb_driver_interfaces[] full\n"); return -1; } path =3D kmalloc(path_length, GFP_KERNEL); @@ -2423,7 +2379,7 @@ static int ni_usb_driver_probe(struct usb_interface *= interface, const struct usb return -ENOMEM; } usb_make_path(usb_dev, path, path_length); - dev_info(&usb_dev->dev, "ni_usb_gpib: probe succeeded for path: %s\n", pa= th); + dev_info(&usb_dev->dev, "probe succeeded for path: %s\n", path); kfree(path); mutex_unlock(&ni_usb_hotplug_lock); return 0; @@ -2458,8 +2414,7 @@ static void ni_usb_driver_disconnect(struct usb_inter= face *interface) } } if (i =3D=3D MAX_NUM_NI_USB_INTERFACES) - dev_err(&usb_dev->dev, "%s: unable to find interface in ni_usb_driver_in= terfaces[]? bug?\n", - __func__); + dev_err(&usb_dev->dev, "unable to find interface bug?\n"); usb_put_dev(usb_dev); mutex_unlock(&ni_usb_hotplug_lock); } @@ -2498,9 +2453,9 @@ 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); } - 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); + dev_dbg(&usb_dev->dev, + "bus %d dev num %d gpib%d, interface %i suspended\n", + usb_dev->bus->busnum, usb_dev->devnum, board->minor, i); } =20 mutex_unlock(&ni_usb_hotplug_lock); @@ -2535,15 +2490,15 @@ static int ni_usb_driver_resume(struct usb_interfac= e *interface) mutex_lock(&ni_priv->interrupt_transfer_lock); retval =3D usb_submit_urb(ni_priv->interrupt_urb, GFP_KERNEL); if (retval) { - dev_err(&usb_dev->dev, "%s: failed to resubmit interrupt urb, retval= =3D%i\n", - __func__, retval); + dev_err(&usb_dev->dev, "resume failed to resubmit interrupt urb, retva= l=3D%i\n", + retval); mutex_unlock(&ni_priv->interrupt_transfer_lock); mutex_unlock(&ni_usb_hotplug_lock); return retval; } mutex_unlock(&ni_priv->interrupt_transfer_lock); } else { - dev_err(&usb_dev->dev, "%s: bug! int urb not set up\n", __func__); + dev_err(&usb_dev->dev, "bug! resume int urb not set up\n"); mutex_unlock(&ni_usb_hotplug_lock); return -EINVAL; } @@ -2600,9 +2555,9 @@ static int ni_usb_driver_resume(struct usb_interface = *interface) if (ni_priv->ren_state) ni_usb_remote_enable(board, 1); =20 - 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); + dev_dbg(&usb_dev->dev, + "bus %d dev num %d gpib%d, interface %i resumed\n", + usb_dev->bus->busnum, usb_dev->devnum, board->minor, i); } =20 mutex_unlock(&ni_usb_hotplug_lock); @@ -2610,7 +2565,7 @@ static int ni_usb_driver_resume(struct usb_interface = *interface) } =20 static struct usb_driver ni_usb_bus_driver =3D { - .name =3D "ni_usb_gpib", + .name =3D DRV_NAME, .probe =3D ni_usb_driver_probe, .disconnect =3D ni_usb_driver_disconnect, .suspend =3D ni_usb_driver_suspend, @@ -2623,19 +2578,18 @@ static int __init ni_usb_init_module(void) int i; int ret; =20 - pr_info("ni_usb_gpib driver loading\n"); for (i =3D 0; i < MAX_NUM_NI_USB_INTERFACES; i++) ni_usb_driver_interfaces[i] =3D NULL; =20 ret =3D usb_register(&ni_usb_bus_driver); if (ret) { - pr_err("ni_usb_gpib: usb_register failed: error =3D %d\n", ret); + pr_err("usb_register failed: error =3D %d\n", ret); return ret; } =20 ret =3D gpib_register_driver(&ni_usb_gpib_interface, THIS_MODULE); if (ret) { - pr_err("ni_usb_gpib: gpib_register_driver failed: error =3D %d\n", ret); + pr_err("gpib_register_driver failed: error =3D %d\n", ret); return ret; } =20 @@ -2644,7 +2598,6 @@ static int __init ni_usb_init_module(void) =20 static void __exit ni_usb_exit_module(void) { - pr_info("ni_usb_gpib driver unloading\n"); gpib_unregister_driver(&ni_usb_gpib_interface); usb_deregister(&ni_usb_bus_driver); } --=20 2.48.1