From nobody Thu Mar 13 08:35:05 2025 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (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 5A05025A623 for ; Fri, 14 Feb 2025 11:47:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739533657; cv=none; b=IdSw9g9lM++JPDuSu42Q9GekpmMdJUXpJoZ+jOyItSU8vdPPRVe0sl/vrYsEjAfHLPTYSMa3xLy2Z/sILlOCQLky2ppk00wCP490hruJetWKHTuY0opqB6z4SE3kFBzSJ2XxIpjfhC5G9OdVQOtib4h2qSmjmG6uOxewPdpBy9s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739533657; c=relaxed/simple; bh=N/ZFeWdku78CWtKPgOIYb8+yg57duuPjSE+bpdnW1C8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IIQ+AwRGaznawXXWCo3JE+oru4bIQzeAjHnAK30eDa0AIpaIZ2X4m0kRYtBTGOgjZ/KIzDsOWojw6hAZkXwfMBXkKOghFVNwtWiufVF72nG5Sbvd+sF9VnevpSl2pKd2b1IjDEe7DrKrrySmDWgwsk+CYlv3qMbpH1BGq0rhWL4= 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=VqumuPNc; arc=none smtp.client-ip=209.85.128.46 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="VqumuPNc" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-43937cf2131so13332485e9.2 for ; Fri, 14 Feb 2025 03:47:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739533654; x=1740138454; 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=+mJPDiBCYTfw1Nxw+ZwfMQF/cs7coOz1izSBM1/bSuM=; b=VqumuPNcMWDn9g+ddegDwQY6+Jufo/Adow6sepSWI+kCkWtgxJ8DBbYAFdBgydmBgn g26SNJImRiKaRSYwo2MOjXFkkXM/sl2x8FVP7ipNjdp2wvDIGqzZwKfUVOZdfYrTQ0qI uymqsKDi5u3hWG1l+EbZ0hqm4Qj2gkH4Qn0WYcCip3vQKqywC0gW/l8EV8+jKu8ZlFzy TpABYujsA1R2Roz0d0ubK5t3sgR0loVfAGo0vDwQXTi10qrR0zT03PoPyJCJ1EqNauvn 1ghk2ouKyECK48FTkJ8JoX9No2wDd3pgbH5x6TxobOZTsyP6fWklGyLBWxq3GAOtkM8r 4sXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739533654; x=1740138454; 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=+mJPDiBCYTfw1Nxw+ZwfMQF/cs7coOz1izSBM1/bSuM=; b=gthPrM/h/zFT5zR2m/ZrBDgmPAjj6vxL8OecSnxZcVdW5Tff5P7E4DynIRjuucYQB9 0SAHeO8t9YPbLPn0bcOw1qXaJwqlicNZ0XfG7Oc+r4T82/LKraFiMENygdVN31A1OUo1 cQCJX5w9EEiWY4DNzJENE0mJqBg7qnJMIgoi0SA65p4dabgijWXY4H0wKJrSe2sZn5T0 HGIqPMWqfCx/aAGlPPFeKrP4MKZD8LK2FJk9DjFz2VKRJMpjfy2WJ6doo4xpzL3Rk0y/ tqxVZIVM4jq0PoLX4VA6dVZ+WpWY45tq+YNvMhe2yRbxRswt/0Woc1Mnq8cfRi5ZYyX1 d+RQ== X-Forwarded-Encrypted: i=1; AJvYcCVsB9wjtJnf8PZrhH/X+5c/UWfDUH8AnRO364uqKz9990VSCx/WJxYBBOzcjol/VZ5FycuCoTH43vFM5rk=@vger.kernel.org X-Gm-Message-State: AOJu0YxUy84zVWlhcMTxovjVGZXAesYEbNpACqWKZUonNKljRj6HfIUs wELq1WsX6J1Cs8h5tC15kMbOdQ7HbLoQwSJIABu5CHCh74Mbx0fG X-Gm-Gg: ASbGnctGoxOMfyQ+caC+/eruGo5NVNoHakAmwwxBE5HZKFH4Fsdit+G2Iaa/VK/p8iY Y+p9U6CO+lUVLf+82uKthTqA+PqghFOYrf0tMxGQe08Kml2ClpSpivDstK+puQVtCkVJbGaj67S aG34fHG7pwvex8owO5RUWVPmr/8pB0VysSkrN7CSndpIaOLDjU13CCdwS+kNONyI2bcfh4Jcw1i /1DXLKRdWxA+oKMT7pyWWKB7StdRJWecpTFPUWa65/1ztdk6T37Ud3IXM0I05cGbeF6Xsza1XHL E6lUtwTzZtVf2dbpSL4Ev9RRix9IbmNWUD8avHW0Vxax/RoqTu4= X-Google-Smtp-Source: AGHT+IFk0SrgrmYCZzT6YR28RWd1wrtGIfzMFpBXUt7XzMxRZ05+DRTzZZsq9UFAn3i8S1GBWsXh9Q== X-Received: by 2002:a05:600c:511c:b0:439:441a:3d7e with SMTP id 5b1f17b1804b1-43959a859cdmr111910115e9.20.1739533653330; Fri, 14 Feb 2025 03:47:33 -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.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Feb 2025 03:47:32 -0800 (PST) From: Dave Penkler To: gregkh@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Dave Penkler Subject: [PATCH 01/17] staging: gpib: agilent pci console messaging cleanup Date: Fri, 14 Feb 2025 12:46:52 +0100 Message-ID: <20250214114708.28947-2-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" Remove dev_err messages on interrupted or timed-out reads and writes. User land code can figure out what went wrong with the errno return. Return -ENODEV instead of -1 on attach failure when no board is found. Delete commented out console messages. Use module name in pr_xxx and dev_xxx messages. Remove const char * definition of driver_name and extern definition in .h file. Use DRV_NAME defined as KBUILD_MODNAME instead. Remove driver_name parameter and agilent_82350b string prefix in dev_xxx messages. Use DRV_NAME instead of driver_name in pci_request_regions. Use DRV_NAME instead of hard coded string in the pci_driver struct. Change select dev_info's to dev_dbg. Change pr_err to dev_err where possible. Signed-off-by: Dave Penkler --- .../gpib/agilent_82350b/agilent_82350b.c | 118 ++++++------------ .../gpib/agilent_82350b/agilent_82350b.h | 3 - 2 files changed, 40 insertions(+), 81 deletions(-) diff --git a/drivers/staging/gpib/agilent_82350b/agilent_82350b.c b/drivers= /staging/gpib/agilent_82350b/agilent_82350b.c index 5c62ec24fced..f83e1f321561 100644 --- a/drivers/staging/gpib/agilent_82350b/agilent_82350b.c +++ b/drivers/staging/gpib/agilent_82350b/agilent_82350b.c @@ -4,6 +4,10 @@ * copyright : (C) 2002, 2004 by Frank Mori Hess = * *************************************************************************= **/ =20 +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#define dev_fmt pr_fmt +#define DRV_NAME KBUILD_MODNAME + #include "agilent_82350b.h" #include #include @@ -54,9 +58,6 @@ static int agilent_82350b_accel_read(gpib_board_t *board,= uint8_t *buffer, size_ =20 retval =3D tms9914_read(board, tms_priv, buffer, 1, end, &num_bytes); *bytes_read +=3D num_bytes; - if (retval < 0) - dev_err(board->gpib_dev, "%s: tms9914_read failed retval=3D%i\n", - driver_name, retval); if (retval < 0 || *end) return retval; ++buffer; @@ -89,7 +90,6 @@ static int agilent_82350b_accel_read(gpib_board_t *board,= uint8_t *buffer, size_ test_bit(DEV_CLEAR_BN, &tms_priv->state) || test_bit(TIMO_NUM, &board->status)); if (retval) { - dev_dbg(board->gpib_dev, "%s: read wait interrupted\n", driver_name); retval =3D -ERESTARTSYS; break; } @@ -103,13 +103,10 @@ static int agilent_82350b_accel_read(gpib_board_t *bo= ard, uint8_t *buffer, size_ *end =3D 1; } if (test_bit(TIMO_NUM, &board->status)) { - dev_err(board->gpib_dev, "%s: read timed out\n", driver_name); retval =3D -ETIMEDOUT; break; } if (test_bit(DEV_CLEAR_BN, &tms_priv->state)) { - dev_err(board->gpib_dev, "%s: device clear interrupted read\n", - driver_name); retval =3D -EINTR; break; } @@ -139,18 +136,12 @@ static int translate_wait_return_value(gpib_board_t *= board, int retval) struct agilent_82350b_priv *a_priv =3D board->private_data; struct tms9914_priv *tms_priv =3D &a_priv->tms9914_priv; =20 - if (retval) { - dev_err(board->gpib_dev, "%s: write wait interrupted\n", driver_name); + if (retval) return -ERESTARTSYS; - } - if (test_bit(TIMO_NUM, &board->status)) { - dev_err(board->gpib_dev, "%s: write timed out\n", driver_name); + if (test_bit(TIMO_NUM, &board->status)) return -ETIMEDOUT; - } - if (test_bit(DEV_CLEAR_BN, &tms_priv->state)) { - dev_err(board->gpib_dev, "%s: device clear interrupted write\n", driver_= name); + if (test_bit(DEV_CLEAR_BN, &tms_priv->state)) return -EINTR; - } return 0; } =20 @@ -176,10 +167,8 @@ static int agilent_82350b_accel_write(gpib_board_t *bo= ard, uint8_t *buffer, size =20 event_status =3D read_and_clear_event_status(board); =20 - //pr_info("ag_ac_wr: event status 0x%x tms state 0x%lx\n", event_status, = tms_priv->state); - #ifdef EXPERIMENTAL - pr_info("ag_ac_wr: wait for previous BO to complete if any\n"); + // wait for previous BO to complete if any retval =3D wait_event_interruptible(board->wait, test_bit(DEV_CLEAR_BN, &tms_priv->state) || test_bit(WRITE_READY_BN, &tms_priv->state) || @@ -190,14 +179,11 @@ static int agilent_82350b_accel_write(gpib_board_t *b= oard, uint8_t *buffer, size return retval; #endif =20 - //pr_info("ag_ac_wr: sending first byte\n"); retval =3D agilent_82350b_write(board, buffer, 1, 0, &num_bytes); *bytes_written +=3D num_bytes; if (retval < 0) return retval; =20 - //pr_info("ag_ac_wr: %ld bytes eoi %d tms state 0x%lx\n",length, send_eoi= , tms_priv->state); - write_byte(tms_priv, tms_priv->imr0_bits & ~HR_BOIE, IMR0); for (i =3D 1; i < fifotransferlength;) { clear_bit(WRITE_READY_BN, &tms_priv->state); @@ -210,13 +196,8 @@ static int agilent_82350b_accel_write(gpib_board_t *bo= ard, uint8_t *buffer, size } writeb(ENABLE_TI_TO_SRAM, a_priv->gpib_base + SRAM_ACCESS_CONTROL_REG); =20 - //pr_info("ag_ac_wr: send block: %d bytes tms 0x%lx\n", block_size, - // tms_priv->state); - - if (agilent_82350b_fifo_is_halted(a_priv)) { + if (agilent_82350b_fifo_is_halted(a_priv)) writeb(RESTART_STREAM_BIT, a_priv->gpib_base + STREAM_STATUS_REG); - // pr_info("ag_ac_wr: needed restart\n"); - } =20 retval =3D wait_event_interruptible(board->wait, ((event_status =3D @@ -226,7 +207,6 @@ static int agilent_82350b_accel_write(gpib_board_t *boa= rd, uint8_t *buffer, size test_bit(TIMO_NUM, &board->status)); writeb(0, a_priv->gpib_base + SRAM_ACCESS_CONTROL_REG); num_bytes =3D block_size - read_transfer_counter(a_priv); - //pr_info("ag_ac_wr: sent %ld bytes tms 0x%lx\n", num_bytes, tms_priv->= state); =20 *bytes_written +=3D num_bytes; retval =3D translate_wait_return_value(board, retval); @@ -238,9 +218,6 @@ static int agilent_82350b_accel_write(gpib_board_t *boa= rd, uint8_t *buffer, size return retval; =20 if (send_eoi) { - //pr_info("ag_ac_wr: sending last byte with eoi byte no: %d\n", - // fifotransferlength+1); - retval =3D agilent_82350b_write(board, buffer + fifotransferlength, 1, s= end_eoi, &num_bytes); *bytes_written +=3D num_bytes; @@ -284,7 +261,6 @@ static irqreturn_t agilent_82350b_interrupt(int irq, vo= id *arg) tms9914_interrupt_have_status(board, &a_priv->tms9914_priv, tms9914_stat= us1, tms9914_status2); } -//pr_info("event_status=3D0x%x s1 %x s2 %x\n", event_status,tms9914_status= 1,tms9914_status2); //write-clear status bits if (event_status & (BUFFER_END_STATUS_BIT | TERM_COUNT_STATUS_BIT)) { writeb(event_status & (BUFFER_END_STATUS_BIT | TERM_COUNT_STATUS_BIT), @@ -298,8 +274,6 @@ static irqreturn_t agilent_82350b_interrupt(int irq, vo= id *arg) =20 static void agilent_82350b_detach(gpib_board_t *board); =20 -const char *driver_name =3D "agilent_82350b"; - static int read_transfer_counter(struct agilent_82350b_priv *a_priv) { int lo, mid, value; @@ -536,11 +510,10 @@ 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 !=3D firmware_length) { - dev_err(board->gpib_dev, "%s: the 82350A board requires firmware after p= owering on.\n", - driver_name); + dev_err(board->gpib_dev, "the 82350A board requires firmware after power= ing on.\n"); return -EIO; } - dev_info(board->gpib_dev, "%s: Loading firmware...\n", driver_name); + dev_dbg(board->gpib_dev, "Loading firmware...\n"); =20 // tickle the borg writel(plx_cntrl_static_bits | PLX9050_USER3_DATA_BIT, @@ -559,7 +532,7 @@ static int init_82350a_hardware(gpib_board_t *board, co= nst gpib_board_config_t * usleep_range(10, 20); } if (j =3D=3D timeout) { - dev_err(board->gpib_dev, "%s: timed out loading firmware.\n", driver_na= me); + dev_err(board->gpib_dev, "timed out loading firmware.\n"); return -ETIMEDOUT; } writeb(firmware_data[i], a_priv->gpib_base + CONFIG_DATA_REG); @@ -570,11 +543,10 @@ static int init_82350a_hardware(gpib_board_t *board, = const gpib_board_config_t * usleep_range(10, 20); } if (j =3D=3D timeout) { - dev_err(board->gpib_dev, "%s: timed out waiting for firmware load to com= plete.\n", - driver_name); + dev_err(board->gpib_dev, "timed out waiting for firmware load to complet= e.\n"); return -ETIMEDOUT; } - dev_info(board->gpib_dev, "%s: ...done.\n", driver_name); + dev_dbg(board->gpib_dev, " ...done.\n"); return 0; } =20 @@ -596,15 +568,14 @@ static int test_sram(gpib_board_t *board) unsigned int read_value =3D readb(a_priv->sram_base + i); =20 if ((i & byte_mask) !=3D 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); + dev_err(board->gpib_dev, "SRAM test failed at %d wanted %d got %d\n", + i, (i & byte_mask), read_value); return -EIO; } if (need_resched()) schedule(); } - dev_info(board->gpib_dev, "%s: SRAM test passed 0x%x bytes checked\n", - driver_name, sram_length); + dev_dbg(board->gpib_dev, "SRAM test passed 0x%x bytes checked\n", sram_le= ngth); return 0; } =20 @@ -632,14 +603,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 =3D MODEL_82350B; - dev_info(board->gpib_dev, "%s: Agilent 82350B board found\n", driver_nam= e); + dev_dbg(board->gpib_dev, "Agilent 82350B board found\n"); =20 } else { a_priv->pci_device =3D gpib_pci_get_device(config, PCI_VENDOR_ID_AGILENT, PCI_DEVICE_ID_82351A, NULL); if (a_priv->pci_device) { a_priv->model =3D MODEL_82351A; - dev_info(board->gpib_dev, "%s: Agilent 82351B board found\n", driver_na= me); + dev_dbg(board->gpib_dev, "Agilent 82351B board found\n"); =20 } else { a_priv->pci_device =3D gpib_pci_get_subsys(config, PCI_VENDOR_ID_PLX, @@ -649,46 +620,40 @@ 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 =3D MODEL_82350A; - dev_info(board->gpib_dev, "%s: HP/Agilent 82350A board found\n", - driver_name); + dev_dbg(board->gpib_dev, "HP/Agilent 82350A board found\n"); } else { - dev_err(board->gpib_dev, "%s: no 82350/82351 board found\n", - driver_name); + dev_err(board->gpib_dev, "no 82350/82351 board found\n"); return -ENODEV; } } } if (pci_enable_device(a_priv->pci_device)) { - dev_err(board->gpib_dev, "%s: error enabling pci device\n", driver_name); + dev_err(board->gpib_dev, "error enabling pci device\n"); return -EIO; } - if (pci_request_regions(a_priv->pci_device, driver_name)) - return -EIO; + if (pci_request_regions(a_priv->pci_device, DRV_NAME)) + return -ENOMEM; switch (a_priv->model) { case MODEL_82350A: a_priv->plx_base =3D ioremap(pci_resource_start(a_priv->pci_device, PLX_= MEM_REGION), pci_resource_len(a_priv->pci_device, PLX_MEM_REGION)); - dev_dbg(board->gpib_dev, "%s: plx base address remapped to 0x%p\n", - driver_name, a_priv->plx_base); + dev_dbg(board->gpib_dev, "plx base address remapped to 0x%p\n", a_priv->= plx_base); a_priv->gpib_base =3D ioremap(pci_resource_start(a_priv->pci_device, GPIB_82350A_REGION), pci_resource_len(a_priv->pci_device, GPIB_82350A_REGION)); - dev_dbg(board->gpib_dev, "%s: gpib base address remapped to 0x%p\n", - driver_name, a_priv->gpib_base); + dev_dbg(board->gpib_dev, "chip base address remapped to 0x%p\n", a_priv-= >gpib_base); tms_priv->mmiobase =3D a_priv->gpib_base + TMS9914_BASE_REG; a_priv->sram_base =3D ioremap(pci_resource_start(a_priv->pci_device, SRAM_82350A_REGION), pci_resource_len(a_priv->pci_device, SRAM_82350A_REGION)); - dev_dbg(board->gpib_dev, "%s: sram base address remapped to 0x%p\n", - driver_name, a_priv->sram_base); + dev_dbg(board->gpib_dev, "sram base address remapped to 0x%p\n", a_priv-= >sram_base); a_priv->borg_base =3D ioremap(pci_resource_start(a_priv->pci_device, BORG_82350A_REGION), pci_resource_len(a_priv->pci_device, BORG_82350A_REGION)); - dev_dbg(board->gpib_dev, "%s: borg base address remapped to 0x%p\n", - driver_name, a_priv->borg_base); + dev_dbg(board->gpib_dev, "borg base address remapped to 0x%p\n", a_priv-= >borg_base); =20 retval =3D init_82350a_hardware(board, config); if (retval < 0) @@ -698,21 +663,18 @@ static int agilent_82350b_generic_attach(gpib_board_t= *board, const gpib_board_c case MODEL_82351A: a_priv->gpib_base =3D ioremap(pci_resource_start(a_priv->pci_device, GPI= B_REGION), pci_resource_len(a_priv->pci_device, GPIB_REGION)); - dev_dbg(board->gpib_dev, "%s: gpib base address remapped to 0x%p\n", - driver_name, a_priv->gpib_base); + dev_dbg(board->gpib_dev, "chip base address remapped to 0x%p\n", a_priv-= >gpib_base); tms_priv->mmiobase =3D a_priv->gpib_base + TMS9914_BASE_REG; a_priv->sram_base =3D ioremap(pci_resource_start(a_priv->pci_device, SRA= M_REGION), pci_resource_len(a_priv->pci_device, SRAM_REGION)); - dev_dbg(board->gpib_dev, "%s: sram base address remapped to 0x%p\n", - driver_name, a_priv->sram_base); + dev_dbg(board->gpib_dev, "sram base address remapped to 0x%p\n", a_priv-= >sram_base); a_priv->misc_base =3D ioremap(pci_resource_start(a_priv->pci_device, MIS= C_REGION), pci_resource_len(a_priv->pci_device, MISC_REGION)); - dev_dbg(board->gpib_dev, "%s: misc base address remapped to 0x%p\n", - driver_name, a_priv->misc_base); + dev_dbg(board->gpib_dev, "misc base address remapped to 0x%p\n", a_priv-= >misc_base); break; default: - pr_err("%s: invalid board\n", driver_name); - return -1; + dev_err(board->gpib_dev, "invalid board\n"); + return -ENODEV; } =20 retval =3D test_sram(board); @@ -720,12 +682,12 @@ static int agilent_82350b_generic_attach(gpib_board_t= *board, const gpib_board_c return retval; =20 if (request_irq(a_priv->pci_device->irq, agilent_82350b_interrupt, - IRQF_SHARED, driver_name, board)) { - pr_err("%s: can't request IRQ %d\n", driver_name, a_priv->pci_device->ir= q); + IRQF_SHARED, DRV_NAME, board)) { + dev_err(board->gpib_dev, "failed to obtain irq %d\n", a_priv->pci_device= ->irq); return -EIO; } a_priv->irq =3D a_priv->pci_device->irq; - dev_dbg(board->gpib_dev, "%s: IRQ %d\n", driver_name, a_priv->irq); + dev_dbg(board->gpib_dev, " IRQ %d\n", a_priv->irq); =20 writeb(0, a_priv->gpib_base + SRAM_ACCESS_CONTROL_REG); a_priv->card_mode_bits =3D ENABLE_PCI_IRQ_BIT; @@ -873,7 +835,7 @@ static const struct pci_device_id agilent_82350b_pci_ta= ble[] =3D { MODULE_DEVICE_TABLE(pci, agilent_82350b_pci_table); =20 static struct pci_driver agilent_82350b_pci_driver =3D { - .name =3D "agilent_82350b", + .name =3D DRV_NAME, .id_table =3D agilent_82350b_pci_table, .probe =3D &agilent_82350b_pci_probe }; @@ -884,19 +846,19 @@ static int __init agilent_82350b_init_module(void) =20 result =3D pci_register_driver(&agilent_82350b_pci_driver); if (result) { - pr_err("agilent_82350b: pci_register_driver failed: error =3D %d\n", res= ult); + pr_err("pci_register_driver failed: error =3D %d\n", result); return result; } =20 result =3D gpib_register_driver(&agilent_82350b_unaccel_interface, THIS_M= ODULE); if (result) { - pr_err("agilent_82350b: gpib_register_driver failed: error =3D %d\n", re= sult); + pr_err("gpib_register_driver failed: error =3D %d\n", result); goto err_unaccel; } =20 result =3D gpib_register_driver(&agilent_82350b_interface, THIS_MODULE); if (result) { - pr_err("agilent_82350b: gpib_register_driver failed: error =3D %d\n", re= sult); + pr_err("gpib_register_driver failed: error =3D %d\n", result); goto err_interface; } =20 diff --git a/drivers/staging/gpib/agilent_82350b/agilent_82350b.h b/drivers= /staging/gpib/agilent_82350b/agilent_82350b.h index 8b96ad12647e..1573230c619d 100644 --- a/drivers/staging/gpib/agilent_82350b/agilent_82350b.h +++ b/drivers/staging/gpib/agilent_82350b/agilent_82350b.h @@ -57,9 +57,6 @@ struct agilent_82350b_priv { bool using_fifos; }; =20 -// driver name -extern const char *driver_name; - //registers enum agilent_82350b_gpib_registers =20 --=20 2.48.1 From nobody Thu Mar 13 08:35:05 2025 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) (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 0E315221541 for ; Fri, 14 Feb 2025 11:47:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739533660; cv=none; b=HSW3SdgTA/xBXgcZKqCg7p0PWJo1klljEq6bt9Sg6qFfwNR15i6zL85zWiht1lBDhhhGD4SOhwhPSzNCaDadQ8rkD7fJkeutQe8g3u5j3Ql4EwfF+ewwjgmJMxbdJMpOKn8D0AyT2grA4Zi0X8A8wyPZ9Vo/23GuXQk2K4SHrn0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739533660; c=relaxed/simple; bh=IxVDIkctP1LUMSVUoc9gQ/ewcLPPyAT3NhvZ6AqIyHQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=txIkIYaVinF5vdoToKsEmJZvsDck5X/mLY6QxHh3j1smpDg8DYG6MRio1usFI2S374cN7WUAxDmwZh9KQQ+eAS5IFyJoO12S5xulFSUcGXjCD92VyxJuJK+TMgG2QQE/+Gqjjn7eAWsIAlmYsqWWbPeAP1lLE2Roa4eHpx4Dhyg= 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=GCethhNZ; arc=none smtp.client-ip=209.85.221.46 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="GCethhNZ" Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-38a25d4b9d4so1303484f8f.0 for ; Fri, 14 Feb 2025 03:47:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739533655; x=1740138455; 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=9+PfXfsN0oUC9XPd2q+9CqEOtHstDCBn84q4ujRv4eQ=; b=GCethhNZDzt2fXEDrQRgDI1owekzqD864dZU8ZM+DPJT7D8iqGzxateKE7zQewGlix XRuYNdFsbWZ1spY0iRydvNZXb6SOkM18T/3KQS2jFLzXnYJoYZK2RFn9X1O6Uvi+Gbdt Oc9jMIjDVLc/9PrNZf1c40p2GVszpD+5fn5mCX68DE5NUTY/qe8S/fpnE12cpIMz1uU9 vcaSjXQH3JVzmdA6cGpzLo7zsboftsPKNfcqzr6KIwzIpEwtJzxYTY8Yx3rIjvw68mYI 8lbNo1SO/sxcgWkZQ5YLgEZxHxeJypqFr1f9iQcZJqUpCgxCKSif7OOqdxySIM82fTl8 dfcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739533655; x=1740138455; 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=9+PfXfsN0oUC9XPd2q+9CqEOtHstDCBn84q4ujRv4eQ=; b=fC+LMTMvjyc/XUcyexbHHb8Bj+xk0pbvZ0JNl4BnfBmDDPzX7REnkW7tSXK3VIdUxD fY4mKROvSs2N95NZSFa73ranPmX5WgOzzZdSolCwUCNM1vQCFBiiR++pkhP88pSBdTJ2 ajqq5LR2pzyU9054H+VhvjHv4H2TFWaVd3yzrWFE7ZeYRfF1n9RLwWi0X/AgAKqOTGhc F4eMAV9iR7DtFn+z+nIHBoc0nX9jvIn4ozR0hWmnzBeKlKG0I0VELY6WfOLAD6UJ/aEV sgh6MVS/kwzuM8vNxpTb5VWZ4Z9krBBNPk+r5r1B4rtmCwvPqrXN7eMzZLYfX3cpGgAw MSEQ== X-Forwarded-Encrypted: i=1; AJvYcCVNGlI6H/ggNiUHIpUryywNplHaI6MVCqw6fQr+qL2T9GhakL1Bq+z6i+Pvz3Sdm+6PJOcDXgzq8WYWPss=@vger.kernel.org X-Gm-Message-State: AOJu0YxdzJ1xtoNtg6nK2M0ELw8ctVU9gzP28G+UsmEHd+6Q+bGFKaJo pcogTSE6XqNTaLxdGy5l81ze0Q1mUdH5fl2eODXN2XhC4PE1wKx1sVzDqsTR X-Gm-Gg: ASbGnct2aOTx10MtjXIbtiQBjBQNR51aAQyBeIbnduR8zRDcMtx67ri64HBpeg9Mn9I 2PG01PRZPQDYao10b4eKTIwBuQmlKBC6ff4282zxWXfKQdi3FymbaEOyBnWXpZKilTxVlpwrQb9 SFG+KY9bsU4kADJMfae/SqRYJJwa6AHimh3YrohznFOCyWW0/xwNRCq8Qlu1jS8CzsHAw7PcWS6 d/D5D40d3/o+dSrxlftGVuZIgGry36ZVgr4KUjnZjxfroMx6SAPdUqrBKeAcH5bSkQib83V9JQI UNTnO9/gLnvn3LGMAPv8KgmLQj5fM6PqerLnFQCXpJ0dpPmHl0I= X-Google-Smtp-Source: AGHT+IGGhlAqZSXicyA/P0eISacPel4A1xiGkKuGp01T18eRpqdUUUNLOk5XeXNSsRonjT1jUamuXw== X-Received: by 2002:a05:6000:178b:b0:38d:c55e:ebcf with SMTP id ffacd0b85a97d-38f2451a511mr8136567f8f.52.1739533654770; Fri, 14 Feb 2025 03:47:34 -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.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Feb 2025 03:47:33 -0800 (PST) From: Dave Penkler To: gregkh@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Dave Penkler Subject: [PATCH 02/17] staging: gpib: agilent usb console messaging cleanup Date: Fri, 14 Feb 2025 12:46:53 +0100 Message-ID: <20250214114708.28947-3-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 in usb_driver struct. Remove __func__ parameter in dev_dbg messages as this can be enabled with dynamic debug. Remove __func__ parameter in dev_err messages as they are not needed. The module name is sufficient. Change pr_info to dev_dbg where needed and remove the rest where possible. Remove test and error messages for buffer over run in write and read_registers as these are just trying to catch bugs in the driver. Remove agilent_82357a string prefix in error messages. Return -EIO for too many reads in read_registers instead of continuing after printing an error message. Change pr_warn to dev_warn. Remove warning on calls for unsupported functionality. Remove test and message for buffer overflow in agilent_82357_init and agilent_82357a_go_idle which are just checking for a driver bug. Use actual indeces in the array instead of i and then incrementing i so that the code is clear and there is no need to check for overflow or print a message. Signed-off-by: Dave Penkler --- .../gpib/agilent_82357a/agilent_82357a.c | 359 +++++++----------- 1 file changed, 143 insertions(+), 216 deletions(-) diff --git a/drivers/staging/gpib/agilent_82357a/agilent_82357a.c b/drivers= /staging/gpib/agilent_82357a/agilent_82357a.c index 69f0e490d401..7ebebe00dc48 100644 --- a/drivers/staging/gpib/agilent_82357a/agilent_82357a.c +++ b/drivers/staging/gpib/agilent_82357a/agilent_82357a.c @@ -7,6 +7,10 @@ =20 #define _GNU_SOURCE =20 +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#define dev_fmt pr_fmt +#define DRV_NAME KBUILD_MODNAME + #include #include #include @@ -79,14 +83,12 @@ static int agilent_82357a_send_bulk_msg(struct agilent_= 82357a_priv *a_priv, void =20 retval =3D usb_submit_urb(a_priv->bulk_urb, GFP_KERNEL); if (retval) { - 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", r= etval); mutex_unlock(&a_priv->bulk_alloc_lock); goto cleanup; } mutex_unlock(&a_priv->bulk_alloc_lock); if (down_interruptible(&context->complete)) { - dev_err(&usb_dev->dev, "%s: interrupted\n", __func__); retval =3D -ERESTARTSYS; goto cleanup; } @@ -149,14 +151,12 @@ static int agilent_82357a_receive_bulk_msg(struct agi= lent_82357a_priv *a_priv, v =20 retval =3D usb_submit_urb(a_priv->bulk_urb, GFP_KERNEL); if (retval) { - 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(&a_priv->bulk_alloc_lock); goto cleanup; } mutex_unlock(&a_priv->bulk_alloc_lock); if (down_interruptible(&context->complete)) { - dev_err(&usb_dev->dev, "%s: interrupted\n", __func__); retval =3D -ERESTARTSYS; goto cleanup; } @@ -205,7 +205,6 @@ static int agilent_82357a_receive_control_msg(struct ag= ilent_82357a_priv *a_priv =20 static void agilent_82357a_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, t= rue); } =20 @@ -225,7 +224,7 @@ static int agilent_82357a_write_registers(struct agilen= t_82357a_priv *a_priv, static const int max_writes =3D 31; =20 if (num_writes > max_writes) { - dev_err(&usb_dev->dev, "%s: bug! num_writes=3D%i too large\n", __func__,= num_writes); + dev_err(&usb_dev->dev, "bug! num_writes=3D%i too large\n", num_writes); return -EIO; } out_data_length =3D num_writes * bytes_per_write + header_length; @@ -239,8 +238,7 @@ static int agilent_82357a_write_registers(struct agilen= t_82357a_priv *a_priv, out_data[i++] =3D writes[j].address; out_data[i++] =3D writes[j].value; } - if (i > out_data_length) - dev_err(&usb_dev->dev, "%s: bug! buffer overrun\n", __func__); + retval =3D mutex_lock_interruptible(&a_priv->bulk_transfer_lock); if (retval) { kfree(out_data); @@ -249,8 +247,8 @@ static int agilent_82357a_write_registers(struct agilen= t_82357a_priv *a_priv, retval =3D agilent_82357a_send_bulk_msg(a_priv, out_data, i, &bytes_writt= en, 1000); kfree(out_data); if (retval) { - dev_err(&usb_dev->dev, "%s: agilent_82357a_send_bulk_msg returned %i, by= tes_written=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); mutex_unlock(&a_priv->bulk_transfer_lock); return retval; } @@ -265,20 +263,19 @@ static int agilent_82357a_write_registers(struct agil= ent_82357a_priv *a_priv, mutex_unlock(&a_priv->bulk_transfer_lock); =20 if (retval) { - dev_err(&usb_dev->dev, "%s: agilent_82357a_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); agilent_82357a_dump_raw_block(in_data, bytes_read); kfree(in_data); return -EIO; } if (in_data[0] !=3D (0xff & ~DATA_PIPE_CMD_WR_REGS)) { - dev_err(&usb_dev->dev, "%s: error, bulk command=3D0x%x !=3D ~DATA_PIPE_C= MD_WR_REGS\n", - __func__, in_data[0]); + dev_err(&usb_dev->dev, "bulk command=3D0x%x !=3D ~DATA_PIPE_CMD_WR_REGS\= n", in_data[0]); return -EIO; } if (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]); + dev_err(&usb_dev->dev, "nonzero error code 0x%x in DATA_PIPE_CMD_WR_REGS= response\n", + in_data[1]); return -EIO; } kfree(in_data); @@ -299,9 +296,10 @@ static int agilent_82357a_read_registers(struct agilen= t_82357a_priv *a_priv, static const int header_length =3D 2; static const int max_reads =3D 62; =20 - if (num_reads > max_reads) - dev_err(&usb_dev->dev, "%s: bug! num_reads=3D%i too large\n", __func__, = num_reads); - + if (num_reads > max_reads) { + dev_err(&usb_dev->dev, "bug! num_reads=3D%i too large\n", num_reads); + return -EIO; + } out_data_length =3D num_reads + header_length; out_data =3D kmalloc(out_data_length, GFP_KERNEL); if (!out_data) @@ -311,8 +309,7 @@ static int agilent_82357a_read_registers(struct agilent= _82357a_priv *a_priv, out_data[i++] =3D num_reads; for (j =3D 0; j < num_reads; j++) out_data[i++] =3D reads[j].address; - if (i > out_data_length) - dev_err(&usb_dev->dev, "%s: bug! buffer overrun\n", __func__); + if (blocking) { retval =3D mutex_lock_interruptible(&a_priv->bulk_transfer_lock); if (retval) { @@ -329,8 +326,8 @@ static int agilent_82357a_read_registers(struct agilent= _82357a_priv *a_priv, retval =3D agilent_82357a_send_bulk_msg(a_priv, out_data, i, &bytes_writt= en, 1000); kfree(out_data); if (retval) { - dev_err(&usb_dev->dev, "%s: agilent_82357a_send_bulk_msg returned %i, by= tes_written=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); mutex_unlock(&a_priv->bulk_transfer_lock); return retval; } @@ -345,21 +342,20 @@ static int agilent_82357a_read_registers(struct agile= nt_82357a_priv *a_priv, mutex_unlock(&a_priv->bulk_transfer_lock); =20 if (retval) { - dev_err(&usb_dev->dev, "%s: agilent_82357a_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); agilent_82357a_dump_raw_block(in_data, bytes_read); kfree(in_data); return -EIO; } i =3D 0; if (in_data[i++] !=3D (0xff & ~DATA_PIPE_CMD_RD_REGS)) { - dev_err(&usb_dev->dev, "%s: error, bulk command=3D0x%x !=3D ~DATA_PIPE_C= MD_RD_REGS\n", - __func__, in_data[0]); + dev_err(&usb_dev->dev, "bulk command=3D0x%x !=3D ~DATA_PIPE_CMD_RD_REGS\= n", in_data[0]); return -EIO; } if (in_data[i++]) { - dev_err(&usb_dev->dev, "%s: nonzero error code 0x%x in DATA_PIPE_CMD_RD_= REGS response\n", - __func__, in_data[1]); + dev_err(&usb_dev->dev, "nonzero error code 0x%x in DATA_PIPE_CMD_RD_REGS= response\n", + in_data[1]); return -EIO; } for (j =3D 0; j < num_reads; j++) @@ -390,14 +386,13 @@ 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) { - dev_err(&usb_dev->dev, "%s: agilent_82357a_receive_control_msg() returne= d %i\n", - __func__, receive_control_retval); + dev_err(&usb_dev->dev, "82357a_receive_control_msg() returned %i\n", + receive_control_retval); retval =3D -EIO; goto cleanup; } if (status_data[0] !=3D (~XFER_ABORT & 0xff)) { - dev_err(&usb_dev->dev, "%s: error, major code=3D0x%x !=3D ~XFER_ABORT\n", - __func__, status_data[0]); + dev_err(&usb_dev->dev, "major code=3D0x%x !=3D ~XFER_ABORT\n", status_da= ta[0]); retval =3D -EIO; goto cleanup; } @@ -413,8 +408,7 @@ static int agilent_82357a_abort(struct agilent_82357a_p= riv *a_priv, int flush) fallthrough; case UGP_ERR_FLUSHING_ALREADY: default: - dev_err(&usb_dev->dev, "%s: abort returned error code=3D0x%x\n", - __func__, status_data[1]); + dev_err(&usb_dev->dev, "abort returned error code=3D0x%x\n", status_data= [1]); retval =3D -EIO; break; } @@ -469,8 +463,8 @@ static int agilent_82357a_read(gpib_board_t *board, uin= t8_t *buffer, size_t leng retval =3D agilent_82357a_send_bulk_msg(a_priv, out_data, i, &bytes_writt= en, msec_timeout); kfree(out_data); if (retval || bytes_written !=3D i) { - dev_err(&usb_dev->dev, "%s: agilent_82357a_send_bulk_msg returned %i, by= tes_written=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); mutex_unlock(&a_priv->bulk_transfer_lock); if (retval < 0) return retval; @@ -501,19 +495,19 @@ static int agilent_82357a_read(gpib_board_t *board, u= int8_t *buffer, size_t leng &extra_bytes_read, 100); bytes_read +=3D extra_bytes_read; if (extra_bytes_retval) { - dev_err(&usb_dev->dev, "%s: extra_bytes_retval=3D%i, bytes_read=3D%i\n", - __func__, extra_bytes_retval, bytes_read); + dev_err(&usb_dev->dev, "extra_bytes_retval=3D%i, bytes_read=3D%i\n", + extra_bytes_retval, bytes_read); agilent_82357a_abort(a_priv, 0); } } else if (retval) { - dev_err(&usb_dev->dev, "%s: agilent_82357a_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); agilent_82357a_abort(a_priv, 0); } mutex_unlock(&a_priv->bulk_transfer_lock); if (bytes_read > length + 1) { bytes_read =3D length + 1; - pr_warn("%s: bytes_read > length? truncating", __func__); + dev_warn(&usb_dev->dev, "bytes_read > length? truncating"); } =20 if (bytes_read >=3D 1) { @@ -584,8 +578,8 @@ static ssize_t agilent_82357a_generic_write(gpib_board_= t *board, uint8_t *buffer kfree(out_data); if (retval || raw_bytes_written !=3D i) { agilent_82357a_abort(a_priv, 0); - dev_err(&usb_dev->dev, "%s: agilent_82357a_send_bulk_msg returned %i, ra= w_bytes_written=3D%i, i=3D%i\n", - __func__, retval, raw_bytes_written, i); + dev_err(&usb_dev->dev, "send_bulk_msg returned %i, raw_bytes_written=3D%= i, i=3D%i\n", + retval, raw_bytes_written, i); mutex_unlock(&a_priv->bulk_transfer_lock); if (retval < 0) return retval; @@ -597,7 +591,7 @@ static ssize_t agilent_82357a_generic_write(gpib_board_= t *board, uint8_t *buffer &a_priv->interrupt_flags) || test_bit(TIMO_NUM, &board->status)); if (retval) { - dev_err(&usb_dev->dev, "%s: wait write complete interrupted\n", __func__= ); + dev_dbg(&usb_dev->dev, "wait write complete interrupted\n"); agilent_82357a_abort(a_priv, 0); mutex_unlock(&a_priv->bulk_transfer_lock); return -ERESTARTSYS; @@ -614,8 +608,7 @@ static ssize_t agilent_82357a_generic_write(gpib_board_= t *board, uint8_t *buffer read_reg.address =3D BSR; retval =3D agilent_82357a_read_registers(a_priv, &read_reg, 1, 1); if (retval) { - dev_err(&usb_dev->dev, "%s: agilent_82357a_read_registers() returned er= ror\n", - __func__); + dev_err(&usb_dev->dev, "read_registers() returned error\n"); return -ETIMEDOUT; } =20 @@ -632,8 +625,7 @@ static ssize_t agilent_82357a_generic_write(gpib_board_= t *board, uint8_t *buffer read_reg.address =3D ADSR; retval =3D agilent_82357a_read_registers(a_priv, &read_reg, 1, 1); if (retval) { - dev_err(&usb_dev->dev, "%s: agilent_82357a_read_registers() returned e= rror\n", - __func__); + dev_err(&usb_dev->dev, "read_registers() returned error\n"); return -ETIMEDOUT; } adsr =3D read_reg.value; @@ -659,8 +651,7 @@ static ssize_t agilent_82357a_generic_write(gpib_board_= t *board, uint8_t *buffer 100); mutex_unlock(&a_priv->bulk_transfer_lock); if (retval < 0) { - dev_err(&usb_dev->dev, "%s: agilent_82357a_receive_control_msg() returne= d %i\n", - __func__, retval); + dev_err(&usb_dev->dev, "receive_control_msg() returned %i\n", retval); kfree(status_data); return -EIO; } @@ -699,8 +690,7 @@ int agilent_82357a_take_control_internal(gpib_board_t *= board, int synchronous) write.value =3D AUX_TCA; retval =3D agilent_82357a_write_registers(a_priv, &write, 1); if (retval) - dev_err(&usb_dev->dev, "%s: agilent_82357a_write_registers() returned er= ror\n", - __func__); + dev_err(&usb_dev->dev, "write_registers() returned error\n"); =20 return retval; } @@ -741,8 +731,7 @@ static int agilent_82357a_go_to_standby(gpib_board_t *b= oard) write.value =3D AUX_GTS; retval =3D agilent_82357a_write_registers(a_priv, &write, 1); if (retval) - dev_err(&usb_dev->dev, "%s: agilent_82357a_write_registers() returned er= ror\n", - __func__); + dev_err(&usb_dev->dev, "write_registers() returned error\n"); return 0; } =20 @@ -771,8 +760,7 @@ static void agilent_82357a_request_system_control(gpib_= board_t *board, int reque ++i; retval =3D agilent_82357a_write_registers(a_priv, writes, i); if (retval) - dev_err(&usb_dev->dev, "%s: agilent_82357a_write_registers() returned er= ror\n", - __func__); + dev_err(&usb_dev->dev, "write_registers() returned error\n"); return;// retval; } =20 @@ -791,8 +779,7 @@ static void agilent_82357a_interface_clear(gpib_board_t= *board, int assert) } retval =3D agilent_82357a_write_registers(a_priv, &write, 1); if (retval) - dev_err(&usb_dev->dev, "%s: agilent_82357a_write_registers() returned er= ror\n", - __func__); + dev_err(&usb_dev->dev, "write_registers() returned error\n"); } =20 static void agilent_82357a_remote_enable(gpib_board_t *board, int enable) @@ -808,8 +795,7 @@ static void agilent_82357a_remote_enable(gpib_board_t *= board, int enable) write.value |=3D AUX_CS; retval =3D agilent_82357a_write_registers(a_priv, &write, 1); if (retval) - dev_err(&usb_dev->dev, "%s: agilent_82357a_write_registers() returned er= ror\n", - __func__); + dev_err(&usb_dev->dev, "write_registers() returned error\n"); a_priv->ren_state =3D enable; return;// 0; } @@ -818,10 +804,9 @@ static int agilent_82357a_enable_eos(gpib_board_t *boa= rd, uint8_t eos_byte, int { struct agilent_82357a_priv *a_priv =3D board->private_data; =20 - if (compare_8_bits =3D=3D 0) { - pr_warn("%s: hardware only supports 8-bit EOS compare", __func__); + if (compare_8_bits =3D=3D 0) return -EOPNOTSUPP; - } + a_priv->eos_char =3D eos_byte; a_priv->eos_mode =3D REOS | BIN; return 0; @@ -850,8 +835,7 @@ static unsigned int agilent_82357a_update_status(gpib_b= oard_t *board, unsigned i retval =3D agilent_82357a_read_registers(a_priv, &address_status, 1, 0); if (retval) { if (retval !=3D -EAGAIN) - dev_err(&usb_dev->dev, "%s: agilent_82357a_read_registers() returned er= ror\n", - __func__); + dev_err(&usb_dev->dev, "read_registers() returned error\n"); return board->status; } // check for remote/local @@ -883,8 +867,7 @@ static unsigned int agilent_82357a_update_status(gpib_b= oard_t *board, unsigned i retval =3D agilent_82357a_read_registers(a_priv, &bus_status, 1, 0); if (retval) { if (retval !=3D -EAGAIN) - dev_err(&usb_dev->dev, "%s: agilent_82357a_read_registers() returned er= ror\n", - __func__); + dev_err(&usb_dev->dev, "read_registers() returned error\n"); return board->status; } if (bus_status.value & BSR_SRQ_BIT) @@ -907,8 +890,7 @@ static int agilent_82357a_primary_address(gpib_board_t = *board, unsigned int addr write.value =3D address & ADDRESS_MASK; retval =3D agilent_82357a_write_registers(a_priv, &write, 1); if (retval) { - dev_err(&usb_dev->dev, "%s: agilent_82357a_write_registers() returned er= ror\n", - __func__); + dev_err(&usb_dev->dev, "write_registers() returned error\n"); return retval; } return retval; @@ -917,8 +899,8 @@ static int agilent_82357a_primary_address(gpib_board_t = *board, unsigned int addr static int agilent_82357a_secondary_address(gpib_board_t *board, unsigned = int address, int enable) { if (enable) - pr_warn("%s: warning: assigning a secondary address not supported\n", __= func__); - return -EOPNOTSUPP; + return -EOPNOTSUPP; + return 0; } =20 static int agilent_82357a_parallel_poll(gpib_board_t *board, uint8_t *resu= lt) @@ -936,16 +918,14 @@ static int agilent_82357a_parallel_poll(gpib_board_t = *board, uint8_t *result) writes[1].value =3D a_priv->hw_control_bits & ~NOT_PARALLEL_POLL; retval =3D agilent_82357a_write_registers(a_priv, writes, 2); if (retval) { - dev_err(&usb_dev->dev, "%s: agilent_82357a_write_registers() returned er= ror\n", - __func__); + dev_err(&usb_dev->dev, "write_registers() returned error\n"); return retval; } udelay(2); //silly, since usb write will take way longer read.address =3D CPTR; retval =3D agilent_82357a_read_registers(a_priv, &read, 1, 1); if (retval) { - dev_err(&usb_dev->dev, "%s: agilent_82357a_read_registers() returned err= or\n", - __func__); + dev_err(&usb_dev->dev, "read_registers() returned error\n"); return retval; } *result =3D read.value; @@ -956,8 +936,7 @@ static int agilent_82357a_parallel_poll(gpib_board_t *b= oard, uint8_t *result) writes[1].value =3D AUX_RPP; retval =3D agilent_82357a_write_registers(a_priv, writes, 2); if (retval) { - dev_err(&usb_dev->dev, "%s: agilent_82357a_write_registers() returned er= ror\n", - __func__); + dev_err(&usb_dev->dev, "write_registers() returned error\n"); return retval; } return 0; @@ -1005,8 +984,7 @@ static int agilent_82357a_line_status(const gpib_board= _t *board) retval =3D agilent_82357a_read_registers(a_priv, &bus_status, 1, 0); if (retval) { if (retval !=3D -EAGAIN) - dev_err(&usb_dev->dev, "%s: agilent_82357a_read_registers() returned er= ror\n", - __func__); + dev_err(&usb_dev->dev, "read_registers() returned error\n"); return retval; } if (bus_status.value & BSR_REN_BIT) @@ -1055,8 +1033,7 @@ static unsigned int agilent_82357a_t1_delay(gpib_boar= d_t *board, unsigned int na write.value =3D nanosec_to_fast_talker_bits(&nanosec); retval =3D agilent_82357a_write_registers(a_priv, &write, 1); if (retval) - dev_err(&usb_dev->dev, "%s: agilent_82357a_write_registers() returned er= ror\n", - __func__); + dev_err(&usb_dev->dev, "write_registers() returned error\n"); return nanosec; } =20 @@ -1081,7 +1058,7 @@ static void agilent_82357a_interrupt_complete(struct = urb *urb) default: /* other error, resubmit */ retval =3D usb_submit_urb(a_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 @@ -1097,7 +1074,7 @@ static void agilent_82357a_interrupt_complete(struct = urb *urb) =20 retval =3D usb_submit_urb(a_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 agilent_82357a_setup_urbs(gpib_board_t *board) @@ -1133,8 +1110,7 @@ static int agilent_82357a_setup_urbs(gpib_board_t *bo= ard) if (retval) { usb_free_urb(a_priv->interrupt_urb); a_priv->interrupt_urb =3D NULL; - 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); goto setup_exit; } mutex_unlock(&a_priv->interrupt_alloc_lock); @@ -1184,108 +1160,78 @@ static void agilent_82357a_free_private(gpib_board= _t *board) { kfree(board->private_data); board->private_data =3D NULL; - } =20 +#define INIT_NUM_REG_WRITES 18 static int agilent_82357a_init(gpib_board_t *board) { struct agilent_82357a_priv *a_priv =3D board->private_data; struct usb_device *usb_dev =3D interface_to_usbdev(a_priv->bus_interface); struct agilent_82357a_register_pairlet hw_control; - struct agilent_82357a_register_pairlet writes[0x20]; + struct agilent_82357a_register_pairlet writes[INIT_NUM_REG_WRITES]; int retval; - int i; unsigned int nanosec; =20 - i =3D 0; - writes[i].address =3D LED_CONTROL; - writes[i].value =3D FAIL_LED_ON; - ++i; - writes[i].address =3D RESET_TO_POWERUP; - writes[i].value =3D RESET_SPACEBALL; - ++i; - retval =3D agilent_82357a_write_registers(a_priv, writes, i); + writes[0].address =3D LED_CONTROL; + writes[0].value =3D FAIL_LED_ON; + writes[1].address =3D RESET_TO_POWERUP; + writes[1].value =3D RESET_SPACEBALL; + retval =3D agilent_82357a_write_registers(a_priv, writes, 2); if (retval) { - dev_err(&usb_dev->dev, "%s: agilent_82357a_write_registers() returned er= ror\n", - __func__); + dev_err(&usb_dev->dev, "write_registers() returned error\n"); return -EIO; } set_current_state(TASK_INTERRUPTIBLE); if (schedule_timeout(usec_to_jiffies(2000))) return -ERESTARTSYS; - i =3D 0; - writes[i].address =3D AUXCR; - writes[i].value =3D AUX_NBAF; - ++i; - writes[i].address =3D AUXCR; - writes[i].value =3D AUX_HLDE; - ++i; - writes[i].address =3D AUXCR; - writes[i].value =3D AUX_TON; - ++i; - writes[i].address =3D AUXCR; - writes[i].value =3D AUX_LON; - ++i; - writes[i].address =3D AUXCR; - writes[i].value =3D AUX_RSV2; - ++i; - writes[i].address =3D AUXCR; - writes[i].value =3D AUX_INVAL; - ++i; - writes[i].address =3D AUXCR; - writes[i].value =3D AUX_RPP; - ++i; - writes[i].address =3D AUXCR; - writes[i].value =3D AUX_STDL; - ++i; - writes[i].address =3D AUXCR; - writes[i].value =3D AUX_VSTDL; - ++i; - writes[i].address =3D FAST_TALKER_T1; + writes[0].address =3D AUXCR; + writes[0].value =3D AUX_NBAF; + writes[1].address =3D AUXCR; + writes[1].value =3D AUX_HLDE; + writes[2].address =3D AUXCR; + writes[2].value =3D AUX_TON; + writes[3].address =3D AUXCR; + writes[3].value =3D AUX_LON; + writes[4].address =3D AUXCR; + writes[4].value =3D AUX_RSV2; + writes[5].address =3D AUXCR; + writes[5].value =3D AUX_INVAL; + writes[6].address =3D AUXCR; + writes[6].value =3D AUX_RPP; + writes[7].address =3D AUXCR; + writes[7].value =3D AUX_STDL; + writes[8].address =3D AUXCR; + writes[8].value =3D AUX_VSTDL; + writes[9].address =3D FAST_TALKER_T1; nanosec =3D board->t1_nano_sec; - writes[i].value =3D nanosec_to_fast_talker_bits(&nanosec); + writes[9].value =3D nanosec_to_fast_talker_bits(&nanosec); board->t1_nano_sec =3D nanosec; - ++i; - writes[i].address =3D ADR; - writes[i].value =3D board->pad & ADDRESS_MASK; - ++i; - writes[i].address =3D PPR; - writes[i].value =3D 0; - ++i; - writes[i].address =3D SPMR; - writes[i].value =3D 0; - ++i; - writes[i].address =3D PROTOCOL_CONTROL; - writes[i].value =3D WRITE_COMPLETE_INTERRUPT_EN; - ++i; - writes[i].address =3D IMR0; - writes[i].value =3D HR_BOIE | HR_BIIE; - ++i; - writes[i].address =3D IMR1; - writes[i].value =3D HR_SRQIE; - ++i; + writes[10].address =3D ADR; + writes[10].value =3D board->pad & ADDRESS_MASK; + writes[11].address =3D PPR; + writes[11].value =3D 0; + writes[12].address =3D SPMR; + writes[12].value =3D 0; + writes[13].address =3D PROTOCOL_CONTROL; + writes[13].value =3D WRITE_COMPLETE_INTERRUPT_EN; + writes[14].address =3D IMR0; + writes[14].value =3D HR_BOIE | HR_BIIE; + writes[15].address =3D IMR1; + writes[15].value =3D HR_SRQIE; // turn off reset state - writes[i].address =3D AUXCR; - writes[i].value =3D AUX_CHIP_RESET; - ++i; - writes[i].address =3D LED_CONTROL; - writes[i].value =3D FIRMWARE_LED_CONTROL; - ++i; - if (i > ARRAY_SIZE(writes)) { - dev_err(&usb_dev->dev, "%s: bug! writes[] overflow\n", __func__); - return -EFAULT; - } - retval =3D agilent_82357a_write_registers(a_priv, writes, i); + writes[16].address =3D AUXCR; + writes[16].value =3D AUX_CHIP_RESET; + writes[17].address =3D LED_CONTROL; + writes[17].value =3D FIRMWARE_LED_CONTROL; + retval =3D agilent_82357a_write_registers(a_priv, writes, INIT_NUM_REG_WR= ITES); if (retval) { - dev_err(&usb_dev->dev, "%s: agilent_82357a_write_registers() returned er= ror\n", - __func__); + dev_err(&usb_dev->dev, "write_registers() returned error\n"); return -EIO; } hw_control.address =3D HW_CONTROL; retval =3D agilent_82357a_read_registers(a_priv, &hw_control, 1, 1); if (retval) { - dev_err(&usb_dev->dev, "%s: agilent_82357a_read_registers() returned err= or\n", - __func__); + dev_err(&usb_dev->dev, "read_registers() returned error\n"); return -EIO; } a_priv->hw_control_bits =3D (hw_control.value & ~0x7) | NOT_TI_RESET | NO= T_PARALLEL_POLL; @@ -1336,7 +1282,7 @@ static int agilent_82357a_attach(gpib_board_t *board,= const gpib_board_config_t } if (i =3D=3D MAX_NUM_82357A_INTERFACES) { dev_err(board->gpib_dev, - "No Agilent 82357 gpib adapters found, have you loaded its firmware?\n"= ); + "No supported adapters found, have you loaded its firmware?\n"); retval =3D -ENODEV; goto attach_fail; } @@ -1372,8 +1318,7 @@ static int agilent_82357a_attach(gpib_board_t *board,= const gpib_board_config_t goto attach_fail; } =20 - dev_info(&usb_dev->dev, - "bus %d dev num %d attached to gpib minor %d, agilent usb interface %i\= n", + dev_info(&usb_dev->dev, "bus %d dev num %d attached to gpib%d, interface = %i\n", usb_dev->bus->busnum, usb_dev->devnum, board->minor, i); mutex_unlock(&agilent_82357a_hotplug_lock); return retval; @@ -1390,37 +1335,24 @@ static int agilent_82357a_go_idle(gpib_board_t *boa= rd) struct usb_device *usb_dev =3D interface_to_usbdev(a_priv->bus_interface); struct agilent_82357a_register_pairlet writes[0x20]; int retval; - int i; =20 - i =3D 0; // turn on tms9914 reset state - writes[i].address =3D AUXCR; - writes[i].value =3D AUX_CS | AUX_CHIP_RESET; - ++i; + writes[0].address =3D AUXCR; + writes[0].value =3D AUX_CS | AUX_CHIP_RESET; a_priv->hw_control_bits &=3D ~NOT_TI_RESET; - writes[i].address =3D HW_CONTROL; - writes[i].value =3D a_priv->hw_control_bits; - ++i; - writes[i].address =3D PROTOCOL_CONTROL; - writes[i].value =3D 0; - ++i; - writes[i].address =3D IMR0; - writes[i].value =3D 0; - ++i; - writes[i].address =3D IMR1; - writes[i].value =3D 0; - ++i; - writes[i].address =3D LED_CONTROL; - writes[i].value =3D 0; - ++i; - if (i > ARRAY_SIZE(writes)) { - dev_err(&usb_dev->dev, "%s: bug! writes[] overflow\n", __func__); - return -EFAULT; - } - retval =3D agilent_82357a_write_registers(a_priv, writes, i); + writes[1].address =3D HW_CONTROL; + writes[1].value =3D a_priv->hw_control_bits; + writes[2].address =3D PROTOCOL_CONTROL; + writes[2].value =3D 0; + writes[3].address =3D IMR0; + writes[3].value =3D 0; + writes[4].address =3D IMR1; + writes[4].value =3D 0; + writes[5].address =3D LED_CONTROL; + writes[5].value =3D 0; + retval =3D agilent_82357a_write_registers(a_priv, writes, 6); if (retval) { - dev_err(&usb_dev->dev, "%s: agilent_82357a_write_registers() returned er= ror\n", - __func__); + dev_err(&usb_dev->dev, "write_registers() returned error\n"); return -EIO; } return 0; @@ -1445,7 +1377,6 @@ static void agilent_82357a_detach(gpib_board_t *board) agilent_82357a_release_urbs(a_priv); agilent_82357a_free_private(board); } - dev_info(board->gpib_dev, "%s: detached\n", __func__); mutex_unlock(&agilent_82357a_hotplug_lock); } =20 @@ -1510,8 +1441,7 @@ static int agilent_82357a_driver_probe(struct usb_int= erface *interface, if (i =3D=3D MAX_NUM_82357A_INTERFACES) { usb_put_dev(usb_dev); mutex_unlock(&agilent_82357a_hotplug_lock); - dev_err(&usb_dev->dev, "%s: out of space in agilent_82357a_driver_interf= aces[]\n", - __func__); + dev_err(&usb_dev->dev, "out of space in agilent_82357a_driver_interfaces= []\n"); return -1; } path =3D kmalloc(path_length, GFP_KERNEL); @@ -1552,13 +1482,12 @@ static void agilent_82357a_driver_disconnect(struct= usb_interface *interface) mutex_unlock(&a_priv->control_alloc_lock); } } - dev_dbg(&usb_dev->dev, "nulled agilent_82357a_driver_interfaces[%i]\n",= i); agilent_82357a_driver_interfaces[i] =3D NULL; break; } } if (i =3D=3D MAX_NUM_82357A_INTERFACES) - dev_err(&usb_dev->dev, "unable to find interface in agilent_82357a_drive= r_interfaces[]? bug?\n"); + dev_err(&usb_dev->dev, "unable to find interface - bug?\n"); usb_put_dev(usb_dev); =20 mutex_unlock(&agilent_82357a_hotplug_lock); @@ -1583,18 +1512,18 @@ static int agilent_82357a_driver_suspend(struct usb= _interface *interface, pm_mes agilent_82357a_abort(a_priv, 0); retval =3D agilent_82357a_go_idle(board); if (retval) { - dev_err(&usb_dev->dev, "%s: failed to go idle, retval=3D%i\n", - __func__, retval); + dev_err(&usb_dev->dev, "failed to go idle, retval=3D%i\n", + 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); - dev_info(&usb_dev->dev, - "bus %d dev num %d gpib minor %d, agilent usb interface %i suspend= ed\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); } } break; @@ -1631,8 +1560,8 @@ static int agilent_82357a_driver_resume(struct usb_in= terface *interface) mutex_lock(&a_priv->interrupt_alloc_lock); retval =3D usb_submit_urb(a_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, "failed to resubmit interrupt urb in resume, re= tval=3D%i\n", + retval); mutex_unlock(&a_priv->interrupt_alloc_lock); mutex_unlock(&agilent_82357a_hotplug_lock); return retval; @@ -1655,9 +1584,9 @@ static int agilent_82357a_driver_resume(struct usb_in= terface *interface) // assert/unassert REN agilent_82357a_remote_enable(board, a_priv->ren_state); =20 - 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); + 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 resume_exit: @@ -1667,7 +1596,7 @@ static int agilent_82357a_driver_resume(struct usb_in= terface *interface) } =20 static struct usb_driver agilent_82357a_bus_driver =3D { - .name =3D "agilent_82357a_gpib", + .name =3D DRV_NAME, .probe =3D agilent_82357a_driver_probe, .disconnect =3D agilent_82357a_driver_disconnect, .suspend =3D agilent_82357a_driver_suspend, @@ -1680,19 +1609,18 @@ static int __init agilent_82357a_init_module(void) int i; int ret; =20 - pr_info("agilent_82357a_gpib driver loading"); for (i =3D 0; i < MAX_NUM_82357A_INTERFACES; ++i) agilent_82357a_driver_interfaces[i] =3D NULL; =20 ret =3D usb_register(&agilent_82357a_bus_driver); if (ret) { - pr_err("agilent_82357a: 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(&agilent_82357a_gpib_interface, THIS_MODULE); if (ret) { - pr_err("agilent_82357a: gpib_register_driver failed: error =3D %d\n", re= t); + pr_err("gpib_register_driver failed: error =3D %d\n", ret); usb_deregister(&agilent_82357a_bus_driver); return ret; } @@ -1702,7 +1630,6 @@ static int __init agilent_82357a_init_module(void) =20 static void __exit agilent_82357a_exit_module(void) { - pr_info("agilent_82357a_gpib driver unloading"); gpib_unregister_driver(&agilent_82357a_gpib_interface); usb_deregister(&agilent_82357a_bus_driver); } --=20 2.48.1 From nobody Thu Mar 13 08:35:05 2025 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (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 2CA1B263C83 for ; Fri, 14 Feb 2025 11:47:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739533660; cv=none; b=eVi80Jy4kbyvuAcahH+6G/PRMDS1VKFc4x/VZW32H8qHAum8DEFdccv8De9/jqauYC2AVtmnD2u0HE8e5xbwkVgTVfGhXnksTr8jvUM7rnKANVSZRd20SknGlKg3JOQRw6+I9VHtO0n0lHKijWbwYXp4E4uiW7hImteQlZBe5UE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739533660; c=relaxed/simple; bh=X+nJhhbvM7TnzxSU0DL7DSyPTH6mocEcz+Fkw0E2sKY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KF1tR6imVMUhXKv5JOUbFKFubg16EFLZLjUZRsfupaN96RBMn2mYdcmIDLjMKj65I1srVPRe5OQjIhfx07YODndmoDZI+93jD8QNSPM9VarmQouaTcgDXVdgci2Q7PTndWq/KGKskOCWxtvTRbHJALaFUOHeLneiP0Ud7zJTioM= 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=WZXIEqHb; arc=none smtp.client-ip=209.85.128.53 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="WZXIEqHb" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-43690d4605dso12618855e9.0 for ; Fri, 14 Feb 2025 03:47:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739533656; x=1740138456; 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=4a7gByrXb25kpqHP6rNbVvJB6IRS3q8+97gsHt/ID/M=; b=WZXIEqHbewyZolapbisTWuqbOXbVr4qEYzGIoJ8zCPyLJLwOSKDShdK56VY12UgIO6 dG3lwkhM77Uukr8F5+eQkqKaLi3iaQIipl0vFfVpEbmQUkmfgofBMVllgMD/8ddKU9g2 WeN5I8lJngrsGDI+HXTAiQ2N4eREelv+N8zYLuNRKejzEWdkTiOcfTs1s11nXOQO6FIq cUSsOHbKqTAw77QgX+l27yKxemu7QrbqaQM6cv29LQQ1lLTxMqSaW2EhA0SpSXF3oyAY dtos/qzWK1RISJiR7IDk9PLOsG2efl8pWbWkMWKpNXywJeMTLhie5y8kTOC/jULtu6fH GkrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739533656; x=1740138456; 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=4a7gByrXb25kpqHP6rNbVvJB6IRS3q8+97gsHt/ID/M=; b=v5SGxq5m1hNh8MxsSHMIiyKLoCP5POUFbIVRDHzE0J8tnj285MD5lfkgUX6jsnrGgU BnR1be4mvwNr0ZtKeNQPkKGA14x8Uk1tHz3zUG77JUuxj0tYOdJZXEbA1qsVzEthWzEP xpT4pn0qfZnwEcD1drrue5B+1mFavRJ4cnvKaabEy6X9/2PEMNmVsQU9ZIMTQeduJ4K0 lEsewmchJsNo0eBgmxtAizOK4pG95+L4gIITPT3IxwgmpQFBRbvva5cymyLIyQQSI2ao dS3c+Fen99luAvm/nQb3g+PQGQ0AvmMnNaT/4AyGKlAVM5xJWYWzbK3AACVHt/u8XM2p MBsA== X-Forwarded-Encrypted: i=1; AJvYcCXV/4kbvzi5a7hQeBOt2lmMLwMRnDHRdf/mrL7z8fx7luYM/MEoexSgeiHbHYns91LWOO4K87KafsPxQ9Y=@vger.kernel.org X-Gm-Message-State: AOJu0YzWEjrblj5a3w4ZUjrJWZ970o0F0r5sQOalQltyUj+0nRgfVN7P E2wmz2BWLTZKWxscoY0cnyRleYxF8typfKFfBXw+Pt8QLPnkLFeT X-Gm-Gg: ASbGncse5EwJfhwD8y72bnEeumHK6Zvn9Mb6q9CKmdH0ZgQbrq1gxD2Ic/VvV1BdpZG nfjJixOsgT+WM94M+zFfPmwInnTILvaB2xoBQAZoEwMmxZqi7ct99VBmz2M498pocONyrMd4CsA Q3JhjBzIbO1RDVXCoz5akBt/HfgAcMgQLkBmr8sIbwTV5SyDdKPLe2XkcBUADezJdfuDAYffrwR MYZWPM4VP/K/pcRRSnrCAY5/Am0N9Uq2zkCJxc47Q5/V4xkeaJJJYcoGPzY4xlXv0R64AIQz4os 57AnugVLxoSUYG+CE65RTOVGQHMcANoeXjpQTkmWkE6KATFyl+E= X-Google-Smtp-Source: AGHT+IE1AeZVoiLEXdqP4+VloGplXVda2AU8DFuNHD7oIH58wW4sEZXJ6ziiXtNQ7i7ywiZ4PpFKaA== X-Received: by 2002:a05:600c:34cc:b0:439:4376:cc0 with SMTP id 5b1f17b1804b1-439601a9011mr77141425e9.25.1739533656221; Fri, 14 Feb 2025 03:47:36 -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.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Feb 2025 03:47:35 -0800 (PST) From: Dave Penkler To: gregkh@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Dave Penkler Subject: [PATCH 03/17] staging: gpib: cb7210 console messaging cleanup Date: Fri, 14 Feb 2025 12:46:54 +0100 Message-ID: <20250214114708.28947-4-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 "cb7210" everywhere. Remove "cb7210:" string prefix in messages since module name printing is enabled. Change pr_err to dev_err where possible. Remove interrupt warnings. Return consistent error codes with error messages: -EBUSY when resources are busy -ENODEV when device is not present -EIO for others. Return -ENOMEM for failed kmalloc (no message in driver) Remove PCMCIA debug comments, PCMCIA_DEBUG conditional compilation symbol, the DEBUG macro definition and its uses. Change pr_warn to dev_warn and pr_err to dev_err where possible. Remove commented printk. Signed-off-by: Dave Penkler --- drivers/staging/gpib/cb7210/cb7210.c | 133 +++++++++++---------------- 1 file changed, 52 insertions(+), 81 deletions(-) diff --git a/drivers/staging/gpib/cb7210/cb7210.c b/drivers/staging/gpib/cb= 7210/cb7210.c index cb0d8a721687..f2afd851682e 100644 --- a/drivers/staging/gpib/cb7210/cb7210.c +++ b/drivers/staging/gpib/cb7210/cb7210.c @@ -5,6 +5,10 @@ * copyright : (C) 2001, 2002 by Frank Mori Hess *************************************************************************= **/ =20 +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#define dev_fmt pr_fmt +#define DRV_NAME KBUILD_MODNAME + #include "cb7210.h" #include #include @@ -83,12 +87,12 @@ static int fifo_read(gpib_board_t *board, struct cb7210= _priv *cb_priv, uint8_t * =20 *bytes_read =3D 0; if (cb_priv->fifo_iobase =3D=3D 0) { - pr_err("cb7210: fifo iobase is zero!\n"); + dev_err(board->gpib_dev, "fifo iobase is zero!\n"); return -EIO; } *end =3D 0; if (length <=3D cb7210_fifo_size) { - pr_err("cb7210: bug! %s with length < fifo size\n", __func__); + dev_err(board->gpib_dev, " bug! fifo read length < fifo size\n"); return -EINVAL; } =20 @@ -103,7 +107,6 @@ static int fifo_read(gpib_board_t *board, struct cb7210= _priv *cb_priv, uint8_t * test_bit(RECEIVED_END_BN, &nec_priv->state) || test_bit(DEV_CLEAR_BN, &nec_priv->state) || test_bit(TIMO_NUM, &board->status))) { - pr_warn("cb7210: fifo half full wait interrupted\n"); retval =3D -ERESTARTSYS; nec7210_set_reg_bits(nec_priv, IMR2, HR_DMAI, 0); break; @@ -153,7 +156,6 @@ static int fifo_read(gpib_board_t *board, struct cb7210= _priv *cb_priv, uint8_t * test_bit(RECEIVED_END_BN, &nec_priv->state) || test_bit(DEV_CLEAR_BN, &nec_priv->state) || test_bit(TIMO_NUM, &board->status))) { - pr_warn("cb7210: fifo half full wait interrupted\n"); retval =3D -ERESTARTSYS; } if (test_bit(TIMO_NUM, &board->status)) @@ -188,7 +190,6 @@ static int cb7210_accel_read(gpib_board_t *board, uint8= _t *buffer, test_bit(READ_READY_BN, &nec_priv->state) || test_bit(DEV_CLEAR_BN, &nec_priv->state) || test_bit(TIMO_NUM, &board->status))) { - pr_warn("cb7210: read ready wait interrupted\n"); return -ERESTARTSYS; } if (test_bit(TIMO_NUM, &board->status)) @@ -274,7 +275,7 @@ static int fifo_write(gpib_board_t *board, uint8_t *buf= fer, size_t length, size_ =20 *bytes_written =3D 0; if (cb_priv->fifo_iobase =3D=3D 0) { - pr_err("cb7210: fifo iobase is zero!\n"); + dev_err(board->gpib_dev, "fifo iobase is zero!\n"); return -EINVAL; } if (length =3D=3D 0) @@ -293,7 +294,6 @@ static int fifo_write(gpib_board_t *board, uint8_t *buf= fer, size_t length, size_ test_bit(DEV_CLEAR_BN, &nec_priv->state) || test_bit(BUS_ERROR_BN, &nec_priv->state) || test_bit(TIMO_NUM, &board->status))) { - pr_warn("cb7210: fifo wait interrupted\n"); retval =3D -ERESTARTSYS; break; } @@ -309,7 +309,7 @@ static int fifo_write(gpib_board_t *board, uint8_t *buf= fer, size_t length, size_ if (num_bytes + count > length) num_bytes =3D length - count; if (num_bytes % cb7210_fifo_width) { - pr_err("cb7210: bug! %s with odd number of bytes\n", __func__); + dev_err(board->gpib_dev, " bug! fifo write with odd number of bytes\n"); retval =3D -EINVAL; break; } @@ -334,7 +334,6 @@ static int fifo_write(gpib_board_t *board, uint8_t *buf= fer, size_t length, size_ test_bit(DEV_CLEAR_BN, &nec_priv->state) || test_bit(BUS_ERROR_BN, &nec_priv->state) || test_bit(TIMO_NUM, &board->status))) { - pr_err("cb7210: wait for last byte interrupted\n"); retval =3D -ERESTARTSYS; } if (test_bit(TIMO_NUM, &board->status)) @@ -482,7 +481,7 @@ static irqreturn_t cb7210_internal_interrupt(gpib_board= _t *board) status2 =3D read_byte(nec_priv, ISR2); nec7210_interrupt_have_status(board, nec_priv, status1, status2); =20 - dev_dbg(board->gpib_dev, "cb7210: status 0x%x, mode 0x%x\n", hs_status, p= riv->hs_mode_bits); + dev_dbg(board->gpib_dev, "status 0x%x, mode 0x%x\n", hs_status, priv->hs_= mode_bits); =20 clear_bits =3D 0; =20 @@ -860,7 +859,7 @@ static int cb7210_allocate_private(gpib_board_t *board) =20 board->private_data =3D kmalloc(sizeof(struct cb7210_priv), GFP_KERNEL); if (!board->private_data) - return -1; + return -ENOMEM; priv =3D board->private_data; memset(priv, 0, sizeof(struct cb7210_priv)); init_nec7210_private(&priv->nec7210_priv); @@ -922,7 +921,7 @@ static int cb7210_init(struct cb7210_priv *cb_priv, gpi= b_board_t *board) =20 /* poll so we can detect assertion of ATN */ if (gpib_request_pseudo_irq(board, cb_pci_interrupt)) { - pr_err("pc2_gpib: failed to allocate pseudo_irq\n"); + pr_err("failed to allocate pseudo_irq\n"); return -1; } return 0; @@ -962,17 +961,17 @@ static int cb_pci_attach(gpib_board_t *board, const g= pib_board_config_t *config) } } if (!cb_priv->pci_device) { - pr_warn("cb7210: no supported boards found.\n"); - return -1; + dev_err(board->gpib_dev, "no supported boards found.\n"); + return -ENODEV; } =20 if (pci_enable_device(cb_priv->pci_device)) { - pr_err("cb7210: error enabling pci device\n"); - return -1; + dev_err(board->gpib_dev, "error enabling pci device\n"); + return -EIO; } =20 - if (pci_request_regions(cb_priv->pci_device, "cb7210")) - return -1; + if (pci_request_regions(cb_priv->pci_device, DRV_NAME)) + return -EBUSY; switch (cb_priv->pci_chip) { case PCI_CHIP_AMCC_S5933: cb_priv->amcc_iobase =3D pci_resource_start(cb_priv->pci_device, 0); @@ -984,13 +983,14 @@ static int cb_pci_attach(gpib_board_t *board, const g= pib_board_config_t *config) cb_priv->fifo_iobase =3D nec_priv->iobase; break; default: - pr_err("cb7210: bug! unhandled pci_chip=3D%i\n", cb_priv->pci_chip); + dev_err(board->gpib_dev, "bug! unhandled pci_chip=3D%i\n", cb_priv->pci_= chip); return -EIO; } isr_flags |=3D IRQF_SHARED; - if (request_irq(cb_priv->pci_device->irq, cb_pci_interrupt, isr_flags, "c= b7210", board)) { - pr_err("cb7210: can't request IRQ %d\n", cb_priv->pci_device->irq); - return -1; + if (request_irq(cb_priv->pci_device->irq, cb_pci_interrupt, isr_flags, DR= V_NAME, board)) { + dev_err(board->gpib_dev, "can't request IRQ %d\n", + cb_priv->pci_device->irq); + return -EBUSY; } cb_priv->irq =3D cb_priv->pci_device->irq; =20 @@ -1045,20 +1045,22 @@ static int cb_isa_attach(gpib_board_t *board, const= gpib_board_config_t *config) return retval; cb_priv =3D board->private_data; nec_priv =3D &cb_priv->nec7210_priv; - if (!request_region(config->ibbase, cb7210_iosize, "cb7210")) { - pr_err("gpib: ioports starting at 0x%x are already in use\n", config->ib= base); - return -EIO; + if (!request_region(config->ibbase, cb7210_iosize, DRV_NAME)) { + dev_err(board->gpib_dev, "ioports starting at 0x%x are already in use\n", + config->ibbase); + return -EBUSY; } nec_priv->iobase =3D config->ibbase; cb_priv->fifo_iobase =3D nec7210_iobase(cb_priv); =20 bits =3D irq_bits(config->ibirq); if (bits =3D=3D 0) - pr_err("board incapable of using irq %i, try 2-5, 7, 10, or 11\n", confi= g->ibirq); + dev_err(board->gpib_dev, "board incapable of using irq %i, try 2-5, 7, 1= 0, or 11\n", + config->ibirq); =20 // install interrupt handler - if (request_irq(config->ibirq, cb7210_interrupt, isr_flags, "cb7210", boa= rd)) { - pr_err("gpib: can't request IRQ %d\n", config->ibirq); + if (request_irq(config->ibirq, cb7210_interrupt, isr_flags, DRV_NAME, boa= rd)) { + dev_err(board->gpib_dev, "failed to obtain IRQ %d\n", config->ibirq); return -EBUSY; } cb_priv->irq =3D config->ibirq; @@ -1098,7 +1100,7 @@ static const struct pci_device_id cb7210_pci_table[] = =3D { MODULE_DEVICE_TABLE(pci, cb7210_pci_table); =20 static struct pci_driver cb7210_pci_driver =3D { - .name =3D "cb7210", + .name =3D DRV_NAME, .id_table =3D cb7210_pci_table, .probe =3D &cb7210_pci_probe }; @@ -1121,23 +1123,6 @@ static struct pci_driver cb7210_pci_driver =3D { #include #include =20 -/* - * All the PCMCIA modules use PCMCIA_DEBUG to control debugging. If - * you do not define PCMCIA_DEBUG at all, all the debug code will be - * left out. If you compile with PCMCIA_DEBUG=3D0, the debug code will - * be present but disabled -- but it can then be enabled for specific - * modules at load time with a 'pc_debug=3D#' option to insmod. - */ - -#define PCMCIA_DEBUG 1 - -#ifdef PCMCIA_DEBUG -static int pc_debug =3D PCMCIA_DEBUG; -#define DEBUG(n, args...) do {if (pc_debug > (n)) pr_debug(args); } while = (0) -#else -#define DEBUG(args...) -#endif - /* * The event() function is this driver's Card Services event handler. * It will be called by Card Services when an appropriate card status @@ -1202,8 +1187,6 @@ static int cb_gpib_probe(struct pcmcia_device *link) =20 // int ret, i; =20 - DEBUG(0, "%s(0x%p)\n", __func__, link); - /* Allocate space for private device-specific data */ info =3D kzalloc(sizeof(*info), GFP_KERNEL); if (!info) @@ -1243,8 +1226,6 @@ static void cb_gpib_remove(struct pcmcia_device *link) struct local_info *info =3D link->priv; //struct gpib_board_t *dev =3D info->dev; =20 - DEBUG(0, "%s(0x%p)\n", __func__, link); - if (info->dev) cb_pcmcia_detach(info->dev); cb_gpib_release(link); @@ -1272,7 +1253,6 @@ static int cb_gpib_config(struct pcmcia_device *link) =20 handle =3D link; dev =3D link->priv; - DEBUG(0, "%s(0x%p)\n", __func__, link); =20 retval =3D pcmcia_loop_config(link, &cb_gpib_config_iteration, NULL); if (retval) { @@ -1281,8 +1261,6 @@ static int cb_gpib_config(struct pcmcia_device *link) return -ENODEV; } =20 - DEBUG(0, "gpib_cs: manufacturer: 0x%x card: 0x%x\n", link->manf_id, link-= >card_id); - /* * This actually configures the PCMCIA socket -- setting up * the I/O windows and the interrupt mapping. @@ -1294,7 +1272,6 @@ static int cb_gpib_config(struct pcmcia_device *link) return -ENODEV; } =20 - pr_info("gpib device loaded\n"); return 0; } /* gpib_config */ =20 @@ -1306,7 +1283,6 @@ static int cb_gpib_config(struct pcmcia_device *link) =20 static void cb_gpib_release(struct pcmcia_device *link) { - DEBUG(0, "%s(0x%p)\n", __func__, link); pcmcia_disable_device(link); } =20 @@ -1314,10 +1290,9 @@ static int cb_gpib_suspend(struct pcmcia_device *lin= k) { //struct local_info *info =3D link->priv; //struct gpib_board_t *dev =3D info->dev; - DEBUG(0, "%s(0x%p)\n", __func__, link); =20 if (link->open) - pr_warn("Device still open ???\n"); + dev_warn(&link->dev, "Device still open\n"); //netif_device_detach(dev); =20 return 0; @@ -1327,11 +1302,9 @@ static int cb_gpib_resume(struct pcmcia_device *link) { //struct local_info *info =3D link->priv; //struct gpib_board_t *dev =3D info->dev; - DEBUG(0, "%s(0x%p)\n", __func__, link); =20 /*if (link->open) { * ni_gpib_probe(dev); / really? - * printk("Gpib resumed ???\n"); * //netif_device_attach(dev); * */ @@ -1358,7 +1331,6 @@ static struct pcmcia_driver cb_gpib_cs_driver =3D { =20 static void cb_pcmcia_cleanup_module(void) { - DEBUG(0, "cb_gpib_cs: unloading\n"); pcmcia_unregister_driver(&cb_gpib_cs_driver); } =20 @@ -1453,8 +1425,8 @@ static int cb_pcmcia_attach(gpib_board_t *board, cons= t gpib_board_config_t *conf int retval; =20 if (!curr_dev) { - pr_err("no cb pcmcia cards found\n"); - return -1; + dev_err(board->gpib_dev, "no cb pcmcia cards found\n"); + return -ENODEV; } =20 retval =3D cb7210_generic_attach(board); @@ -1465,18 +1437,17 @@ static int cb_pcmcia_attach(gpib_board_t *board, co= nst gpib_board_config_t *conf nec_priv =3D &cb_priv->nec7210_priv; =20 if (!request_region(curr_dev->resource[0]->start, resource_size(curr_dev-= >resource[0]), - "cb7210")) { - pr_err("gpib: ioports starting at 0x%lx are already in use\n", - (unsigned long)curr_dev->resource[0]->start); - return -EIO; + DRV_NAME)) { + dev_err(board->gpib_dev, "ioports starting at 0x%lx are already in use\n= ", + (unsigned long)curr_dev->resource[0]->start); + return -EBUSY; } nec_priv->iobase =3D curr_dev->resource[0]->start; cb_priv->fifo_iobase =3D curr_dev->resource[0]->start; =20 - if (request_irq(curr_dev->irq, cb7210_interrupt, IRQF_SHARED, - "cb7210", board)) { - pr_err("cb7210: failed to request IRQ %d\n", curr_dev->irq); - return -1; + if (request_irq(curr_dev->irq, cb7210_interrupt, IRQF_SHARED, DRV_NAME, b= oard)) { + dev_err(board->gpib_dev, "failed to request IRQ %d\n", curr_dev->irq); + return -EBUSY; } cb_priv->irq =3D curr_dev->irq; =20 @@ -1509,68 +1480,68 @@ static int __init cb7210_init_module(void) =20 ret =3D pci_register_driver(&cb7210_pci_driver); if (ret) { - pr_err("cb7210: pci_register_driver failed: error =3D %d\n", ret); + pr_err("pci_register_driver failed: error =3D %d\n", ret); return ret; } =20 ret =3D gpib_register_driver(&cb_pci_interface, THIS_MODULE); if (ret) { - pr_err("cb7210: gpib_register_driver failed: error =3D %d\n", ret); + pr_err("gpib_register_driver failed: error =3D %d\n", ret); goto err_pci; } =20 ret =3D gpib_register_driver(&cb_isa_interface, THIS_MODULE); if (ret) { - pr_err("cb7210: gpib_register_driver failed: error =3D %d\n", ret); + pr_err("gpib_register_driver failed: error =3D %d\n", ret); goto err_isa; } =20 ret =3D gpib_register_driver(&cb_pci_accel_interface, THIS_MODULE); if (ret) { - pr_err("cb7210: gpib_register_driver failed: error =3D %d\n", ret); + pr_err("gpib_register_driver failed: error =3D %d\n", ret); goto err_pci_accel; } =20 ret =3D gpib_register_driver(&cb_pci_unaccel_interface, THIS_MODULE); if (ret) { - pr_err("cb7210: gpib_register_driver failed: error =3D %d\n", ret); + pr_err("gpib_register_driver failed: error =3D %d\n", ret); goto err_pci_unaccel; } =20 ret =3D gpib_register_driver(&cb_isa_accel_interface, THIS_MODULE); if (ret) { - pr_err("cb7210: gpib_register_driver failed: error =3D %d\n", ret); + pr_err("gpib_register_driver failed: error =3D %d\n", ret); goto err_isa_accel; } =20 ret =3D gpib_register_driver(&cb_isa_unaccel_interface, THIS_MODULE); if (ret) { - pr_err("cb7210: gpib_register_driver failed: error =3D %d\n", ret); + pr_err("gpib_register_driver failed: error =3D %d\n", ret); goto err_isa_unaccel; } =20 #ifdef CONFIG_GPIB_PCMCIA ret =3D gpib_register_driver(&cb_pcmcia_interface, THIS_MODULE); if (ret) { - pr_err("cb7210: gpib_register_driver failed: error =3D %d\n", ret); + pr_err("gpib_register_driver failed: error =3D %d\n", ret); goto err_pcmcia; } =20 ret =3D gpib_register_driver(&cb_pcmcia_accel_interface, THIS_MODULE); if (ret) { - pr_err("cb7210: gpib_register_driver failed: error =3D %d\n", ret); + pr_err("gpib_register_driver failed: error =3D %d\n", ret); goto err_pcmcia_accel; } =20 ret =3D gpib_register_driver(&cb_pcmcia_unaccel_interface, THIS_MODULE); if (ret) { - pr_err("cb7210: gpib_register_driver failed: error =3D %d\n", ret); + pr_err("gpib_register_driver failed: error =3D %d\n", ret); goto err_pcmcia_unaccel; } =20 ret =3D pcmcia_register_driver(&cb_gpib_cs_driver); if (ret) { - pr_err("cb7210: pcmcia_register_driver failed: error =3D %d\n", ret); + pr_err("pcmcia_register_driver failed: error =3D %d\n", ret); goto err_pcmcia_driver; } #endif --=20 2.48.1 From nobody Thu Mar 13 08:35:05 2025 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (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 09155263F29 for ; Fri, 14 Feb 2025 11:47:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739533661; cv=none; b=IaOaVJFAgbsxae+F0FQTVNXPZWRdKe7hnGr1uMDSvM3MOI6ylMzUyzJai1oOff2/RVt3m+9Q0Cr40+7UZUIjZNfGaKRRYksRW21qvxAo2CIC9Cq8XI0zph4MCxaJqPf/HDy5P++6tbG1Q8mF/wF020M8X0K882j302Aw6u+K+Po= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739533661; c=relaxed/simple; bh=rUGDhfFDrk0MWHqYT1IWrnxD3W6PCHEf+7PmS9Epz3w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gFDVnMaS7JQ+SFxuSIkaL/Nr7T/kp4768yVDi2v8powJT0sKmI9psAtrz57w7K/7W8sk+0Tkd0RDoCDbXRAhm1ZURU/K8DpF7mRLizRBPh1OZGnCGxlMtTYIw8xTZzJzlZ6QUTxoSJYiFh2UMnJ4/0Y2f3rJ6pTid3tY+KDf2mQ= 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=GUZDzR9J; arc=none smtp.client-ip=209.85.128.46 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="GUZDzR9J" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-4362bae4d7dso12243555e9.1 for ; Fri, 14 Feb 2025 03:47:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739533658; x=1740138458; 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=BUv19RGcYQpZSEBJ0Vtlqw1z83q+vhXACeQec7ri6KQ=; b=GUZDzR9Jm/BTYnG5F6PAJBVzXGt9te1Az6115yZPfrtacobcnnzDBIUXrh4TJqrdka z7JaBIwwfG4xAcDPwsjNDHUaqsvM/3LRJXHiqt2gD5QcLsM8AtROn7ADZSEjsG435syc cdR14y4VFXVm1BEWJnamgwm6su99xNlCKQCtq494kLc8zjkST4GGj0vZVZT822DDC5N1 YO5OjQIJ9iw0AHi807GzpY2VPVxujTTv3GycOfgiZQRKmNbfjGGUiZGVUwCVJA+JTGq2 03ZJJulymOqi1eD0zZbQAcc0Xzf61crFl2v9jBOg+SAFTmhUJcmxHPvFJXosthceNcHV COkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739533658; x=1740138458; 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=BUv19RGcYQpZSEBJ0Vtlqw1z83q+vhXACeQec7ri6KQ=; b=piQ90/ksTFnqyNcEqId1xvvMJFNA+2k9FJELvMUQld00lKhqT0cN2y/pGt5R9qFjPQ 7IwJMUrXPyGsEa3N1wvGd3E9gyVwMkMjP6BMkBPChn5Uuy03T0JqZ1Eix9jsx/cXWSlU 3hDtmp8POqZUYoCmh5ZENO3kjO/1g7sAPlPSJROOYeRFEwsylPseaiIyp2aYnhWtSvML 2O0vKPD+Zf712ju2eaLrfHngGA7tnNr08RBZ5AJTi/CrQgY2ABONOMQ85vMNkB9vJ/Kc mCcsdC2jB4KNCvTjx/C+JitX+8zVooOHAK5zdoetk4irO7yNePMrgs9hQ9PwFAGsU9pC a4og== X-Forwarded-Encrypted: i=1; AJvYcCVCnWSxVVANO2fSbPdelAit20L1YK9EW3aAatzn8lcMqU3O+bE95yxTz2o4PvOZ57WS7CDDgKgl6lnHVjA=@vger.kernel.org X-Gm-Message-State: AOJu0YwH161izUZkD/1A0Iv6AJn2dtwRBfJm1mRLTgNkfXAod42bvNcx y+XLkX4AEahKpZxV4gfR035NmmVg07cESwLk0cGvHBFJRSYbhqGh X-Gm-Gg: ASbGncuFu+KY0ea60hcWJLqiskqQfKNlPuERwvK2s04PLZbScIcCXsYtGZUDwmlCsiu hsH3yksOjgTH/r2zZxAxsObQoNqitFcsHhjja7n0Oz67C21poiLrKILZIzLdeKj8j8Z9wXfFD8V TA4kNp352+kVTdsFEJGHYZxqvVII97Lw71T6Iuyt3fFsepxTp+gSFkJlTPn8pd0vbtOwFy5gh2F +WdHS709DAngVyLTnZAYjvlgD32weX30PAEUwlw3Fe333f/+PIo2/AlUj07MKsdTpKn+DNFD82A v7hV3ektXtZLMN8csZM8BXOyAU/eLM5KEZbw+tuckAmYwTaITP8= X-Google-Smtp-Source: AGHT+IGEj1EojGorZkgQLdLeySDwST5jQV8w0POuV9puJVnFIALlKFtVNBNwfiSpVsq2bxTCXrNkrA== X-Received: by 2002:a05:600c:4f0b:b0:439:554e:70da with SMTP id 5b1f17b1804b1-439581cbcfemr135289865e9.31.1739533657879; Fri, 14 Feb 2025 03:47:37 -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.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Feb 2025 03:47:36 -0800 (PST) From: Dave Penkler To: gregkh@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Dave Penkler Subject: [PATCH 04/17] staging: gpib: cec_gpib console messaging cleanup Date: Fri, 14 Feb 2025 12:46:55 +0100 Message-ID: <20250214114708.28947-5-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 "cec_gpib" in pci_driver struct. Remove "cec_gpib:" string prefix in messages since module name printing is enabled. Change pr_err to dev_err where possible. Return consistent error codes with error messages: -EBUSY when resources are busy -ENODEV when device is not present -EIO for others. Signed-off-by: Dave Penkler --- drivers/staging/gpib/cec/cec_gpib.c | 32 +++++++++++++++-------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/drivers/staging/gpib/cec/cec_gpib.c b/drivers/staging/gpib/cec= /cec_gpib.c index 18933223711e..8f2b4b46a446 100644 --- a/drivers/staging/gpib/cec/cec_gpib.c +++ b/drivers/staging/gpib/cec/cec_gpib.c @@ -4,6 +4,10 @@ * copyright : (C) 2002 by Frank Mori Hess *************************************************************************= **/ =20 +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#define dev_fmt pr_fmt +#define DRV_NAME KBUILD_MODNAME + #include "cec.h" #include #include @@ -284,31 +288,29 @@ static int cec_pci_attach(gpib_board_t *board, const = gpib_board_config_t *config break; } if (!cec_priv->pci_device) { - pr_err("gpib: no cec PCI board found\n"); - return -1; + dev_err(board->gpib_dev, "no cec PCI board found\n"); + return -ENODEV; } =20 if (pci_enable_device(cec_priv->pci_device)) { - pr_err("error enabling pci device\n"); - return -1; + dev_err(board->gpib_dev, "error enabling pci device\n"); + return -EIO; } =20 if (pci_request_regions(cec_priv->pci_device, "cec-gpib")) - return -1; + return -EBUSY; =20 cec_priv->plx_iobase =3D pci_resource_start(cec_priv->pci_device, 1); - pr_info(" plx9050 base address 0x%lx\n", cec_priv->plx_iobase); - nec_priv->iobase =3D pci_resource_start(cec_priv->pci_device, 3); - pr_info(" nec7210 base address 0x%x\n", nec_priv->iobase); + nec_priv->iobase =3D pci_resource_start(cec_priv->pci_device, 3); =20 isr_flags |=3D IRQF_SHARED; - if (request_irq(cec_priv->pci_device->irq, cec_interrupt, isr_flags, "pci= -gpib", board)) { - pr_err("gpib: can't request IRQ %d\n", cec_priv->pci_device->irq); - return -1; + if (request_irq(cec_priv->pci_device->irq, cec_interrupt, isr_flags, DRV_= NAME, board)) { + dev_err(board->gpib_dev, "failed to obtain IRQ %d\n", cec_priv->pci_devi= ce->irq); + return -EBUSY; } cec_priv->irq =3D cec_priv->pci_device->irq; if (gpib_request_pseudo_irq(board, cec_interrupt)) { - pr_err("cec: failed to allocate pseudo irq\n"); + dev_err(board->gpib_dev, "failed to allocate pseudo irq\n"); return -1; } cec_init(cec_priv, board); @@ -355,7 +357,7 @@ static const struct pci_device_id cec_pci_table[] =3D { MODULE_DEVICE_TABLE(pci, cec_pci_table); =20 static struct pci_driver cec_pci_driver =3D { - .name =3D "cec_gpib", + .name =3D DRV_NAME, .id_table =3D cec_pci_table, .probe =3D &cec_pci_probe }; @@ -366,13 +368,13 @@ static int __init cec_init_module(void) =20 result =3D pci_register_driver(&cec_pci_driver); if (result) { - pr_err("cec_gpib: pci_register_driver failed: error =3D %d\n", result); + pr_err("pci_register_driver failed: error =3D %d\n", result); return result; } =20 result =3D gpib_register_driver(&cec_pci_interface, THIS_MODULE); if (result) { - pr_err("cec_gpib: gpib_register_driver failed: error =3D %d\n", result); + pr_err("gpib_register_driver failed: error =3D %d\n", result); return result; } =20 --=20 2.48.1 From nobody Thu Mar 13 08:35:05 2025 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (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 8121A2627E5 for ; Fri, 14 Feb 2025 11:47:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739533664; cv=none; b=HDTPTIzYL6Vx1NulDK2mhYfPd/A7MfBQ7xRZzIxeuis8ITACPk+g7BdN0809MqltN7hR+t3AbqLCJij+V6Fni6dOdbxtV4ArVSJ7dfouHU4dtEcSMjFJR9A/2sC1ogKIi8Sr0Vt5g0UptmM8DZ2ZkoZYEYNuRSweuspeITd/Yic= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739533664; c=relaxed/simple; bh=ZywxOrYgvHFFiQ/8GDS8TfmtpXo4vJhcFhYY/yQLh4o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AxSsG4X/zJ0NlCMlnH0DgChji+qyuaRihTG1h28Yuj2sK9fYdLAN7QgjFiVqmKNqGwL3ah26DCC/11qwT8Cr5yhXGSZ/sJrRtAoFMMDxbyEHDiE1p7J3arAp5YvbCKhmJiBuTIhHagjHnzgFOvdFtircFKEwPDv+tHRHrLScDtY= 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=C+jxO+lR; arc=none smtp.client-ip=209.85.128.41 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="C+jxO+lR" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-4395f81db4dso11939275e9.1 for ; Fri, 14 Feb 2025 03:47:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739533660; x=1740138460; 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=UXyrKlOrfR3q5Ztt5mPFoThAT1sW/ZsLF0+k90uvq1I=; b=C+jxO+lRuc28/CoD4l6AWxnwe5E9qE061EiePmq1/vG8T9d7iRq+xaKKcZzWTsnJws JgDuqpVnuaSBFFOFxE763uXI1IuUnEqZ8ENluzXucI72fUqjUjG+5D7191m+YMNxe/rm 3vFEB5gQa8epiI0OMOUezA16edq2qHNFA5yVWToIe0IMwKw3udvvJ0bFwLlTUfFqlbZE yvYF8VMaSgf6jRg2JwbbmhtK1yicGuDoiWsAtIeLcUvcZ10PcgW8zZjVLJU1bv/B7HNH 9DQJfLkZe7xyCYr/qvSdD7VU/5cmDxclgwQXk0+JzrfxbgMEKk9Hyd9FoYPrO6VoMA/h 4H2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739533660; x=1740138460; 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=UXyrKlOrfR3q5Ztt5mPFoThAT1sW/ZsLF0+k90uvq1I=; b=u02p99c+cqeC2k5lXu1pwfW7EV+ZwJONzd4imbc0yF12XsCrVXTyKQC6DbF81OEc3s R7GCSCgtcor4gcNBTEGoDkNr0/kN7/LORNzSGK62/25ksDFYdTOP9kcEMzWeL5DsodMj 85HxkaPizZ5YkjGnoh5nl99xUoDk6JmnCADOXnjk3Kdi0iS/YZTJ/bwvtORez5CIRfRN QfGDBxGy3Y+Ch7vGUM58yXT3dToUyhHJ9D0ovsPNBGwOiUKk9gAJuggf0OCOjAc1KtxP 5/0HTfMZbAYEjsVUbDWlE1IbAQZynRdS7y54BaR/86WUxjGZ6xqsFapqbEpnvVI2lpgq OZog== X-Forwarded-Encrypted: i=1; AJvYcCUTxNs+Qeyw7vur5GEKUWgPex/6UEmVmnKus57UrQuEKq6WVyCjDwqXFqGlsX+syFbLKJQrbvegLvEvQi8=@vger.kernel.org X-Gm-Message-State: AOJu0Yz/BpoTtZbdL+ZHi9j8VbFdMtWzpkt/f5Oawmq4cCXuzjDZQcFx CUdoBNAvgGBJEgfBSs/kE63PFI9hCNFjzuFU8tgGFG1DVgG85yt+q+xBTw== X-Gm-Gg: ASbGncuzhaLhVBv6SLJRRRPUef1DcrYYNm/3v7/TgqROpfvGF+AszFRqljMIA9bk/Fm MAaHCkcwbfOxuAtf/XJ7Zc7PUDrDXEvDaZaqvaPIGLah+sK6XzGxWokDALebBTwtG/zrdtKA5SI 1OqqWyCxflLCeIVp4/BoKghKgcZzxX47Pa3KMwMW3L26x3cunSevnvxpNAu079COo56DWIsl3my p1bIhJ4TyvzEnsvH7vqZJdW3+dMTo/XTi4uhAXiD5HOI7II/oCQAtZeZJYXRs8tpKR0oRZfBCb1 Z9wBMDj1yE8M+w9LbINlu+wSs9OM7yPgFqxA3E+GWqRsOjsrCfk= X-Google-Smtp-Source: AGHT+IHWR2BBjTJ2Y2EAhBzpRZh9XEXRCPHOfzYuef9eGKtrToLwMZcWdJBDL3bC9QEUvtNPd7mOQw== X-Received: by 2002:a05:600c:1d20:b0:438:e521:1a4d with SMTP id 5b1f17b1804b1-43960e81a94mr72325745e9.5.1739533659455; Fri, 14 Feb 2025 03:47:39 -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.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Feb 2025 03:47:38 -0800 (PST) From: Dave Penkler To: gregkh@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Dave Penkler Subject: [PATCH 05/17] staging: gpib: common core console messaging cleanup Date: Fri, 14 Feb 2025 12:46:56 +0100 Message-ID: <20250214114708.28947-6-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 Change pr_err to dev_err wherever possible. Remove dev_dbg messages on entry to some functions. Remove error messages where userland can figure out what went wrong through errno. Remove __func__ and pid parameters in dev_dbg messages as these can be enabled by dynamic debug. Remove minor and "gpib" from dev_err and dev_dbg messages since this information is printed by the dev name. Signed-off-by: Dave Penkler --- drivers/staging/gpib/common/gpib_os.c | 127 ++++++++++---------------- drivers/staging/gpib/common/iblib.c | 109 ++++++++-------------- 2 files changed, 85 insertions(+), 151 deletions(-) diff --git a/drivers/staging/gpib/common/gpib_os.c b/drivers/staging/gpib/c= ommon/gpib_os.c index 4901e660242e..301c8a1a62c2 100644 --- a/drivers/staging/gpib/common/gpib_os.c +++ b/drivers/staging/gpib/common/gpib_os.c @@ -5,6 +5,9 @@ *************************************************************************= ** */ =20 +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#define dev_fmt pr_fmt + #include "ibsys.h" #include #include @@ -90,7 +93,7 @@ void os_start_timer(gpib_board_t *board, unsigned int use= c_timeout) /* Starts the timeout task */ { if (timer_pending(&board->timer)) { - pr_err("gpib: bug! timer already running?\n"); + dev_err(board->gpib_dev, "bug! timer already running?\n"); return; } clear_bit(TIMO_NUM, &board->status); @@ -140,7 +143,7 @@ static void pseudo_irq_handler(struct timer_list *t) int gpib_request_pseudo_irq(gpib_board_t *board, irqreturn_t (*handler)(in= t, void *)) { if (timer_pending(&board->pseudo_irq.timer) || board->pseudo_irq.handler)= { - pr_err("gpib: only one pseudo interrupt per board allowed\n"); + dev_err(board->gpib_dev, "only one pseudo interrupt per board allowed\n"= ); return -1; } =20 @@ -260,8 +263,6 @@ int get_serial_poll_byte(gpib_board_t *board, unsigned = int pad, int sad, unsigne { gpib_status_queue_t *device; =20 - dev_dbg(board->gpib_dev, "%s:()\n", __func__); - device =3D get_gpib_status_queue(board, pad, sad); if (num_status_bytes(device)) return pop_status_byte(board, device, poll_byte); @@ -273,7 +274,6 @@ int autopoll_all_devices(gpib_board_t *board) { int retval; =20 - 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)) { @@ -290,7 +290,7 @@ int autopoll_all_devices(gpib_board_t *board) return retval; } =20 - dev_dbg(board->gpib_dev, "%s complete\n", __func__); + dev_dbg(board->gpib_dev, "complete\n"); /* need to wake wait queue in case someone is * waiting on RQS */ @@ -308,8 +308,6 @@ static int setup_serial_poll(gpib_board_t *board, unsig= ned int usec_timeout) size_t bytes_written; int ret; =20 - dev_dbg(board->gpib_dev, "entering %s()\n", __func__); - os_start_timer(board, usec_timeout); ret =3D ibcac(board, 1, 1); if (ret < 0) { @@ -326,7 +324,7 @@ static int setup_serial_poll(gpib_board_t *board, unsig= ned int usec_timeout) =20 ret =3D board->interface->command(board, cmd_string, i, &bytes_written); if (ret < 0 || bytes_written < i) { - pr_err("gpib: failed to setup serial poll\n"); + dev_dbg(board->gpib_dev, "failed to setup serial poll\n"); os_remove_timer(board); return -EIO; } @@ -344,7 +342,7 @@ static int read_serial_poll_byte(gpib_board_t *board, u= nsigned int pad, int i; size_t nbytes; =20 - dev_dbg(board->gpib_dev, "entering %s(), pad=3D%i sad=3D%i\n", __func__, = pad, sad); + dev_dbg(board->gpib_dev, "entering pad=3D%i sad=3D%i\n", pad, sad); =20 os_start_timer(board, usec_timeout); ret =3D ibcac(board, 1, 1); @@ -361,7 +359,7 @@ static int read_serial_poll_byte(gpib_board_t *board, u= nsigned int pad, =20 ret =3D board->interface->command(board, cmd_string, i, &nbytes); if (ret < 0 || nbytes < i) { - pr_err("gpib: failed to setup serial poll\n"); + dev_err(board->gpib_dev, "failed to setup serial poll\n"); os_remove_timer(board); return -EIO; } @@ -371,7 +369,7 @@ static int read_serial_poll_byte(gpib_board_t *board, u= nsigned int pad, // read poll result ret =3D board->interface->read(board, result, 1, &end_flag, &nbytes); if (ret < 0 || nbytes < 1) { - pr_err("gpib: serial poll failed\n"); + dev_err(board->gpib_dev, "serial poll failed\n"); os_remove_timer(board); return -EIO; } @@ -386,8 +384,6 @@ static int cleanup_serial_poll(gpib_board_t *board, uns= igned int usec_timeout) int ret; size_t bytes_written; =20 - dev_dbg(board->gpib_dev, "entering %s()\n", __func__); - os_start_timer(board, usec_timeout); ret =3D ibcac(board, 1, 1); if (ret < 0) { @@ -399,7 +395,7 @@ static int cleanup_serial_poll(gpib_board_t *board, uns= igned int usec_timeout) cmd_string[1] =3D UNT; ret =3D board->interface->command(board, cmd_string, 2, &bytes_written); if (ret < 0 || bytes_written < 2) { - pr_err("gpib: failed to disable serial poll\n"); + dev_err(board->gpib_dev, "failed to disable serial poll\n"); os_remove_timer(board); return -EIO; } @@ -435,8 +431,6 @@ int serial_poll_all(gpib_board_t *board, unsigned int u= sec_timeout) u8 result; unsigned int num_bytes =3D 0; =20 - dev_dbg(board->gpib_dev, "entering %s()\n", __func__); - head =3D &board->device_list; if (head->next =3D=3D head) return 0; @@ -482,12 +476,12 @@ int dvrsp(gpib_board_t *board, unsigned int pad, int = sad, int retval; =20 if ((status & CIC) =3D=3D 0) { - pr_err("gpib: not CIC during serial poll\n"); + dev_err(board->gpib_dev, "not CIC during serial poll\n"); return -1; } =20 if (pad > MAX_GPIB_PRIMARY_ADDRESS || sad > MAX_GPIB_SECONDARY_ADDRESS ||= sad < -1) { - pr_err("gpib: bad address for serial poll"); + dev_err(board->gpib_dev, "bad address for serial poll"); return -1; } =20 @@ -544,20 +538,16 @@ int ibopen(struct inode *inode, struct file *filep) priv =3D filep->private_data; init_gpib_file_private((gpib_file_private_t *)filep->private_data); =20 - dev_dbg(board->gpib_dev, "pid %i, gpib: opening minor %d\n", current->pid= , minor); - if (board->use_count =3D=3D 0) { int retval; =20 retval =3D request_module("gpib%i", minor); - if (retval) { - dev_dbg(board->gpib_dev, "pid %i, gpib: request module returned %i\n", - current->pid, retval); - } + if (retval) + dev_dbg(board->gpib_dev, "request module returned %i\n", retval); } if (board->interface) { if (!try_module_get(board->provider_module)) { - pr_err("gpib: try_module_get() failed\n"); + dev_err(board->gpib_dev, "try_module_get() failed\n"); return -EIO; } board->use_count++; @@ -580,21 +570,19 @@ int ibclose(struct inode *inode, struct file *filep) =20 board =3D &board_array[minor]; =20 - dev_dbg(board->gpib_dev, "pid %i, closing minor %d\n", current->pid, mino= r); - if (priv) { desc =3D handle_to_descriptor(priv, 0); if (desc) { if (desc->autopoll_enabled) { - dev_dbg(board->gpib_dev, "pid %i, decrementing autospollers\n", - current->pid); + dev_dbg(board->gpib_dev, "decrementing autospollers\n"); if (board->autospollers > 0) board->autospollers--; else - pr_err("gpib: Attempt to decrement zero autospollers\n"); + dev_err(board->gpib_dev, + "Attempt to decrement zero autospollers\n"); } } else { - pr_err("gpib: Unexpected null gpib_descriptor\n"); + dev_err(board->gpib_dev, "Unexpected null gpib_descriptor\n"); } =20 cleanup_open_devices(priv, board); @@ -630,8 +618,8 @@ long ibioctl(struct file *filep, unsigned int cmd, unsi= gned long arg) if (mutex_lock_interruptible(&board->big_gpib_mutex)) return -ERESTARTSYS; =20 - dev_dbg(board->gpib_dev, "pid %i, ioctl %d, interface=3D%s, use=3D%d, onl= =3D%d\n", - current->pid, cmd & 0xff, + dev_dbg(board->gpib_dev, "ioctl %d, interface=3D%s, use=3D%d, onl=3D%d\n", + cmd & 0xff, board->interface ? board->interface->name : "", board->use_count, board->online); @@ -647,13 +635,13 @@ long ibioctl(struct file *filep, unsigned int cmd, un= signed long arg) break; } if (!board->interface) { - pr_err("gpib: no gpib board configured on /dev/gpib%i\n", minor); + dev_err(board->gpib_dev, "no gpib board configured\n"); retval =3D -ENODEV; goto done; } if (file_priv->got_module =3D=3D 0) { if (!try_module_get(board->provider_module)) { - pr_err("gpib: try_module_get() failed\n"); + dev_err(board->gpib_dev, "try_module_get() failed\n"); retval =3D -EIO; goto done; } @@ -699,8 +687,6 @@ long ibioctl(struct file *filep, unsigned int cmd, unsi= gned long arg) } =20 if (!board->online) { - pr_err("gpib: ioctl %i invalid for offline board\n", - cmd & 0xff); retval =3D -EINVAL; goto done; } @@ -737,8 +723,6 @@ long ibioctl(struct file *filep, unsigned int cmd, unsi= gned long arg) spin_lock(&board->locking_pid_spinlock); if (current->pid !=3D board->locking_pid) { spin_unlock(&board->locking_pid_spinlock); - pr_err("gpib: need to hold board lock to perform ioctl %i\n", - cmd & 0xff); retval =3D -EPERM; goto done; } @@ -830,10 +814,8 @@ static int board_type_ioctl(gpib_file_private_t *file_= priv, gpib_board_t *board, =20 if (!capable(CAP_SYS_ADMIN)) return -EPERM; - if (board->online) { - pr_err("gpib: can't change board type while board is online.\n"); + if (board->online) return -EBUSY; - } =20 retval =3D copy_from_user(&cmd, (void __user *)arg, sizeof(board_type_ioc= tl_t)); if (retval) @@ -1140,8 +1122,8 @@ static int increment_open_device_count(gpib_board_t *= board, struct list_head *he for (list_ptr =3D head->next; list_ptr !=3D head; list_ptr =3D list_ptr->= next) { device =3D list_entry(list_ptr, gpib_status_queue_t, list); if (gpib_address_equal(device->pad, device->sad, pad, sad)) { - dev_dbg(board->gpib_dev, "pid %i, incrementing open count for pad %i, s= ad %i\n", - current->pid, device->pad, device->sad); + dev_dbg(board->gpib_dev, "incrementing open count for pad %i, sad %i\n", + device->pad, device->sad); device->reference_count++; return 0; } @@ -1158,8 +1140,7 @@ static int increment_open_device_count(gpib_board_t *= board, struct list_head *he =20 list_add(&device->list, head); =20 - dev_dbg(board->gpib_dev, "pid %i, opened pad %i, sad %i\n", - current->pid, device->pad, device->sad); + dev_dbg(board->gpib_dev, "opened pad %i, sad %i\n", device->pad, device->= sad); =20 return 0; } @@ -1173,23 +1154,23 @@ static int subtract_open_device_count(gpib_board_t = *board, struct list_head *hea for (list_ptr =3D head->next; list_ptr !=3D head; list_ptr =3D list_ptr->= next) { device =3D list_entry(list_ptr, gpib_status_queue_t, list); if (gpib_address_equal(device->pad, device->sad, pad, sad)) { - dev_dbg(board->gpib_dev, "pid %i, decrementing open count for pad %i, s= ad %i\n", - current->pid, device->pad, device->sad); + dev_dbg(board->gpib_dev, "decrementing open count for pad %i, sad %i\n", + device->pad, device->sad); if (count > device->reference_count) { - pr_err("gpib: bug! in %s()\n", __func__); + dev_err(board->gpib_dev, "bug! in %s()\n", __func__); return -EINVAL; } device->reference_count -=3D count; if (device->reference_count =3D=3D 0) { - dev_dbg(board->gpib_dev, "pid %i, closing pad %i, sad %i\n", - current->pid, device->pad, device->sad); + dev_dbg(board->gpib_dev, "closing pad %i, sad %i\n", + device->pad, device->sad); list_del(list_ptr); kfree(device); } return 0; } } - pr_err("gpib: bug! tried to close address that was never opened!\n"); + dev_err(board->gpib_dev, "bug! tried to close address that was never open= ed!\n"); return -EINVAL; } =20 @@ -1306,8 +1287,6 @@ static int serial_poll_ioctl(gpib_board_t *board, uns= igned long arg) serial_poll_ioctl_t serial_cmd; int retval; =20 - dev_dbg(board->gpib_dev, "pid %i, entering %s()\n", current->pid, __func_= _); - retval =3D copy_from_user(&serial_cmd, (void __user *)arg, sizeof(serial_= cmd)); if (retval) return -EFAULT; @@ -1639,11 +1618,12 @@ static int autospoll_ioctl(gpib_board_t *board, gpi= b_file_private_t *file_priv, board->autospollers--; retval =3D 0; } else { - pr_err("gpib: tried to set number of autospollers negative\n"); + dev_err(board->gpib_dev, + "tried to set number of autospollers negative\n"); retval =3D -EINVAL; } } else { - pr_err("gpib: autopoll disable requested before enable\n"); + dev_err(board->gpib_dev, "autopoll disable requested before enable\n"); retval =3D -EINVAL; } } @@ -1661,10 +1641,8 @@ static int mutex_ioctl(gpib_board_t *board, gpib_fil= e_private_t *file_priv, =20 if (lock_mutex) { retval =3D mutex_lock_interruptible(&board->user_mutex); - if (retval) { - pr_warn("gpib: ioctl interrupted while waiting on lock\n"); + if (retval) return -ERESTARTSYS; - } =20 spin_lock(&board->locking_pid_spinlock); board->locking_pid =3D current->pid; @@ -1672,13 +1650,12 @@ static int mutex_ioctl(gpib_board_t *board, gpib_fi= le_private_t *file_priv, =20 atomic_set(&file_priv->holding_mutex, 1); =20 - dev_dbg(board->gpib_dev, "pid %i, locked board %d mutex\n", - current->pid, board->minor); + dev_dbg(board->gpib_dev, "locked board mutex\n"); } else { spin_lock(&board->locking_pid_spinlock); if (current->pid !=3D board->locking_pid) { - pr_err("gpib: bug! pid %i tried to release mutex held by pid %i\n", - current->pid, board->locking_pid); + dev_err(board->gpib_dev, "bug! pid %i tried to release mutex held by pi= d %i\n", + current->pid, board->locking_pid); spin_unlock(&board->locking_pid_spinlock); return -EPERM; } @@ -1688,8 +1665,7 @@ static int mutex_ioctl(gpib_board_t *board, gpib_file= _private_t *file_priv, atomic_set(&file_priv->holding_mutex, 0); =20 mutex_unlock(&board->user_mutex); - dev_dbg(board->gpib_dev, "pid %i, unlocked board %i mutex\n", - current->pid, board->minor); + dev_dbg(board->gpib_dev, "unlocked board mutex\n"); } return 0; } @@ -1704,7 +1680,7 @@ static int timeout_ioctl(gpib_board_t *board, unsigne= d long arg) return -EFAULT; =20 board->usec_timeout =3D timeout; - dev_dbg(board->gpib_dev, "pid %i, timeout set to %i usec\n", current->pid= , timeout); + dev_dbg(board->gpib_dev, "timeout set to %i usec\n", timeout); =20 return 0; } @@ -1744,10 +1720,8 @@ static int set_local_ppoll_mode_ioctl(gpib_board_t *= board, unsigned long arg) if (retval) return -EFAULT; =20 - if (!board->interface->local_parallel_poll_mode) { - pr_warn("gpib: local/remote parallel poll mode not supported by driver."= ); - return -EIO; - } + if (!board->interface->local_parallel_poll_mode) + return -ENOENT; board->local_ppoll_mode =3D cmd !=3D 0; board->interface->local_parallel_poll_mode(board, board->local_ppoll_mode= ); =20 @@ -1887,7 +1861,7 @@ static int push_gpib_event_nolock(gpib_board_t *board= , short event_type) event =3D kmalloc(sizeof(gpib_event_t), GFP_ATOMIC); if (!event) { queue->dropped_event =3D 1; - pr_err("gpib: failed to allocate memory for event\n"); + dev_err(board->gpib_dev, "failed to allocate memory for event\n"); return -ENOMEM; } =20 @@ -2007,10 +1981,8 @@ static int t1_delay_ioctl(gpib_board_t *board, unsig= ned long arg) unsigned int delay; int retval; =20 - if (!board->interface->t1_delay) { - pr_warn("gpib: t1 delay not implemented in driver!\n"); - return -EIO; - } + if (!board->interface->t1_delay) + return -ENOENT; =20 retval =3D copy_from_user(&cmd, (void __user *)arg, sizeof(cmd)); if (retval) @@ -2087,7 +2059,6 @@ void gpib_unregister_driver(gpib_interface_t *interfa= ce) kfree(entry); } } - pr_info("gpib: unregistered %s interface\n", interface->name); } EXPORT_SYMBOL(gpib_unregister_driver); =20 @@ -2184,7 +2155,7 @@ static int __init gpib_common_init_module(void) { int i; =20 - pr_info("Linux-GPIB core driver\n"); + pr_info("GPIB core driver\n"); init_board_array(board_array, GPIB_MAX_NUM_BOARDS); if (register_chrdev(GPIB_CODE, "gpib", &ib_fops)) { pr_err("gpib: can't get major %d\n", GPIB_CODE); diff --git a/drivers/staging/gpib/common/iblib.c b/drivers/staging/gpib/com= mon/iblib.c index 5f6fa135f505..fd2874c2fff4 100644 --- a/drivers/staging/gpib/common/iblib.c +++ b/drivers/staging/gpib/common/iblib.c @@ -4,6 +4,8 @@ * copyright : (C) 2001, 2002 by Frank Mori Hess *************************************************************************= **/ =20 +#define dev_fmt(fmt) KBUILD_MODNAME ": " fmt + #include "ibsys.h" #include #include @@ -24,10 +26,8 @@ int ibcac(gpib_board_t *board, int sync, int fallback_to= _async) int status =3D ibstatus(board); int retval; =20 - if ((status & CIC) =3D=3D 0) { - pr_err("gpib: not CIC during %s()\n", __func__); - return -1; - } + if ((status & CIC) =3D=3D 0) + return -EINVAL; =20 if (status & ATN) return 0; @@ -76,13 +76,6 @@ static int check_for_command_acceptors(gpib_board_t *boa= rd) if (lines < 0) return lines; =20 - if (lines & ValidATN) { - if ((lines & BusATN) =3D=3D 0) { - pr_err("gpib: ATN not asserted in %s()?", __func__); - return 0; - } - } - if ((lines & ValidNRFD) && (lines & ValidNDAC)) { if ((lines & BusNRFD) =3D=3D 0 && (lines & BusNDAC) =3D=3D 0) return -ENOTCONN; @@ -112,10 +105,8 @@ int ibcmd(gpib_board_t *board, uint8_t *buf, size_t le= ngth, size_t *bytes_writte =20 status =3D ibstatus(board); =20 - if ((status & CIC) =3D=3D 0) { - pr_err("gpib: cannot send command when not controller-in-charge\n"); - return -EIO; - } + if ((status & CIC) =3D=3D 0) + return -EINVAL; =20 os_start_timer(board, board->usec_timeout); =20 @@ -145,14 +136,10 @@ int ibgts(gpib_board_t *board) int status =3D ibstatus(board); int retval; =20 - if ((status & CIC) =3D=3D 0) { - pr_err("gpib: not CIC during %s()\n", __func__); - return -1; - } + if ((status & CIC) =3D=3D 0) + return -EINVAL; =20 retval =3D board->interface->go_to_standby(board); /* go to standby */ - if (retval < 0) - pr_err("gpib: error while going to standby\n"); =20 board->interface->update_status(board, 0); =20 @@ -200,16 +187,15 @@ static int autospoll_thread(void *board_void) retval =3D autopoll_all_devices(board); module_put(board->provider_module); } else { - pr_err("gpib%i: %s: try_module_get() failed!\n", board->minor, __func__= ); + dev_err(board->gpib_dev, "try_module_get() failed!\n"); } if (retval <=3D 0) { - pr_err("gpib%i: %s: stuck SRQ\n", board->minor, __func__); + dev_err(board->gpib_dev, "stuck SRQ\n"); =20 atomic_set(&board->stuck_srq, 1); // XXX could be better set_bit(SRQI_NUM, &board->status); } } - pr_info("gpib%i: exiting autospoll thread\n", board->minor); return retval; } =20 @@ -230,7 +216,6 @@ int ibonline(gpib_board_t *board) retval =3D board->interface->attach(board, &board->config); if (retval < 0) { board->interface->detach(board); - pr_err("gpib: interface attach failed\n"); return retval; } /* nios2nommu on 2.6.11 uclinux kernel has weird problems @@ -241,13 +226,13 @@ int ibonline(gpib_board_t *board) "gpib%d_autospoll_kthread", board->minor); retval =3D IS_ERR(board->autospoll_task); if (retval) { - pr_err("gpib: failed to create autospoll thread\n"); + dev_err(board->gpib_dev, "failed to create autospoll thread\n"); board->interface->detach(board); return retval; } #endif board->online =3D 1; - dev_dbg(board->gpib_dev, "gpib: board online\n"); + dev_dbg(board->gpib_dev, "board online\n"); =20 return 0; } @@ -265,14 +250,14 @@ int iboffline(gpib_board_t *board) if (board->autospoll_task && !IS_ERR(board->autospoll_task)) { retval =3D kthread_stop(board->autospoll_task); if (retval) - pr_err("gpib: kthread_stop returned %i\n", retval); + dev_err(board->gpib_dev, "kthread_stop returned %i\n", retval); board->autospoll_task =3D NULL; } =20 board->interface->detach(board); gpib_deallocate_board(board); board->online =3D 0; - dev_dbg(board->gpib_dev, "gpib: board offline\n"); + dev_dbg(board->gpib_dev, "board offline\n"); =20 return 0; } @@ -320,10 +305,8 @@ int ibrd(gpib_board_t *board, uint8_t *buf, size_t len= gth, int *end_flag, size_t =20 *nbytes =3D 0; *end_flag =3D 0; - if (length =3D=3D 0) { - pr_warn("gpib: %s() called with zero length?\n", __func__); + if (length =3D=3D 0) return 0; - } =20 if (board->master) { retval =3D ibgts(board); @@ -338,10 +321,9 @@ int ibrd(gpib_board_t *board, uint8_t *buf, size_t len= gth, int *end_flag, size_t =20 do { ret =3D board->interface->read(board, buf, length - *nbytes, end_flag, &= bytes_read); - if (ret < 0) { - pr_err("gpib read error\n"); + if (ret < 0) goto ibrd_out; - } + buf +=3D bytes_read; *nbytes +=3D bytes_read; if (need_resched()) @@ -370,10 +352,8 @@ int ibrpp(gpib_board_t *board, uint8_t *result) if (retval) return -1; =20 - if (board->interface->parallel_poll(board, result)) { - pr_err("gpib: parallel poll failed\n"); - retval =3D -1; - } + retval =3D board->interface->parallel_poll(board, result); + os_remove_timer(board); return retval; } @@ -392,10 +372,8 @@ int ibrsv2(gpib_board_t *board, uint8_t status_byte, i= nt new_reason_for_service) int board_status =3D ibstatus(board); const unsigned int MSS =3D status_byte & request_service_bit; =20 - if ((board_status & CIC)) { - pr_err("gpib: interface requested service while CIC\n"); + if ((board_status & CIC)) return -EINVAL; - } =20 if (MSS =3D=3D 0 && new_reason_for_service) return -EINVAL; @@ -424,19 +402,15 @@ int ibrsv2(gpib_board_t *board, uint8_t status_byte, = int new_reason_for_service) */ int ibsic(gpib_board_t *board, unsigned int usec_duration) { - if (board->master =3D=3D 0) { - pr_err("gpib: tried to assert IFC when not system controller\n"); - return -1; - } + if (board->master =3D=3D 0) + return -EINVAL; =20 if (usec_duration < 100) usec_duration =3D 100; - if (usec_duration > 1000) { + if (usec_duration > 1000) usec_duration =3D 1000; - pr_warn("gpib: warning, shortening long udelay\n"); - } =20 - dev_dbg(board->gpib_dev, "sending interface clear\n"); + dev_dbg(board->gpib_dev, "sending interface clear, delay =3D %ius\n", use= c_duration); board->interface->interface_clear(board, 1); udelay(usec_duration); board->interface->interface_clear(board, 0); @@ -444,14 +418,12 @@ int ibsic(gpib_board_t *board, unsigned int usec_dura= tion) return 0; } =20 + /* FIXME make int */ void ibrsc(gpib_board_t *board, int request_control) { board->master =3D request_control !=3D 0; - if (!board->interface->request_system_control) { - pr_err("gpib: bug! driver does not implement request_system_control()\n"= ); - return; - } - board->interface->request_system_control(board, request_control); + if (board->interface->request_system_control) + board->interface->request_system_control(board, request_control); } =20 /* @@ -460,10 +432,8 @@ void ibrsc(gpib_board_t *board, int request_control) */ int ibsre(gpib_board_t *board, int enable) { - if (board->master =3D=3D 0) { - pr_err("gpib: tried to set REN when not system controller\n"); - return -1; - } + if (board->master =3D=3D 0) + return -EINVAL; =20 board->interface->remote_enable(board, enable); /* set or clear REN */ if (!enable) @@ -479,10 +449,9 @@ int ibsre(gpib_board_t *board, int enable) */ int ibpad(gpib_board_t *board, unsigned int addr) { - if (addr > MAX_GPIB_PRIMARY_ADDRESS) { - pr_err("gpib: invalid primary address %u\n", addr); - return -1; - } + if (addr > MAX_GPIB_PRIMARY_ADDRESS) + return -EINVAL; + board->pad =3D addr; if (board->online) board->interface->primary_address(board, board->pad); @@ -498,10 +467,8 @@ int ibpad(gpib_board_t *board, unsigned int addr) */ int ibsad(gpib_board_t *board, int addr) { - if (addr > MAX_GPIB_SECONDARY_ADDRESS) { - pr_err("gpib: invalid secondary address %i\n", addr); - return -1; - } + if (addr > MAX_GPIB_SECONDARY_ADDRESS) + return -EINVAL; board->sad =3D addr; if (board->online) { if (board->sad >=3D 0) @@ -523,10 +490,8 @@ int ibeos(gpib_board_t *board, int eos, int eosflags) { int retval; =20 - if (eosflags & ~EOS_MASK) { - pr_err("bad EOS modes\n"); + if (eosflags & ~EOS_MASK) return -EINVAL; - } if (eosflags & REOS) { retval =3D board->interface->enable_eos(board, eos, eosflags & BIN); } else { @@ -717,10 +682,8 @@ int ibwrt(gpib_board_t *board, uint8_t *buf, size_t cn= t, int send_eoi, size_t *b int ret =3D 0; int retval; =20 - if (cnt =3D=3D 0) { - pr_warn("gpib: %s() called with zero length?\n", __func__); + if (cnt =3D=3D 0) return 0; - } =20 if (board->master) { retval =3D ibgts(board); --=20 2.48.1 From nobody Thu Mar 13 08:35:05 2025 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (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 AA858263F46 for ; Fri, 14 Feb 2025 11:47:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739533665; cv=none; b=Y/xFnKP6FLv/fa4TeuEiP35sIuX2BJTnrlSEMde01S1zUtrCskufQRlApL2QE/sXa/PF0sPussrIwNHE2ej2Cdyh1JshTVt9dYTIzGy6p6JdUK/4vpr+0V1ZHhuShHZXkxTZJydp9XngGpIV6xI24OA5BN6dRalyH12n7u2OTmA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739533665; c=relaxed/simple; bh=V6W9bEnZKDxzkckFLC5A1x2JWYHjHbuBEOadpITQ0jM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=InRIiJisw7gm/qa0AW/B5ZjRHPeMiFHJJKsT/VUXY80oj+VUgmlJYZXF92Yj3c3QL+NwBWodJgh1epjMg8v7ihWzWx1dmM8ypx6kIS9QjiYK8pD9X6dSii6hB+sull3l2mQ/GKDC6258voa5ZjHl7++dJVuMSakrfNTWymw0dgI= 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=b0UK8xbe; arc=none smtp.client-ip=209.85.128.50 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="b0UK8xbe" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-439350f1a0bso12047945e9.0 for ; Fri, 14 Feb 2025 03:47:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739533661; x=1740138461; 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=1d8ytn1sN3HFgOXuhxGigoThdZCA5Wo4+9KBTULduPI=; b=b0UK8xbePN86yulHG0WnpNy8ACThWa/+DUDJ2mm9d894kW6R4wXw+rytkcOI6OXEex gvqtbYZwcfH+2s23GvUIAY3eB9MR7E7LMoejBKw2QW/6+DN/PbcBJCuRebCbrhlT4Gll llek0aE662vGUuQ0SUKAHJsNMn1pVllk0vijm2/+bNGq8ufJtLDWmwk4NvLsyKxYk+eP dvFqfQ2cYfN2CkNyv1Pqfh+ZA9T/d0Ey+Gy1R2jFv548EWmFIhCWxZE9dX8f7bPEZDJ5 DNM5P26bktcvL+LxcPL+X7puuOcZKE3Nd2DmMIJFInKyvPihpba6FBblkhtNRLqk/Y8N 5f9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739533661; x=1740138461; 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=1d8ytn1sN3HFgOXuhxGigoThdZCA5Wo4+9KBTULduPI=; b=dVgLu36ezNaM35iP5NvAV10sDXo2oynhEPbBy9mhDgW4D1v345e8LzZRy2qLo+giQS Ze0U9lAvKxxUAed+jh6kuUFf2D44JiYK0VIgMvu950/vYwqWf4FtvzNxLigljTx6CD+3 xZS/8DyZEFP+KQVpGibbXWyS7ezqokDVo6GqX6nWrpHvKmt3AMLiun1vbVSOXiAymlVm jY5kPkLC63eV6nc4pKTZF5uHwMh1y71XpXxXI+FoiysKuEfckwaKEqwoxXeQqITR1aXo 5DzGeNTxlOMQhNJtvidx5kpUlEbTrVSQnaouksY/r8ybcF7NMqF+pRFleVu2B4XeWHw1 PcCA== X-Forwarded-Encrypted: i=1; AJvYcCU11y88dz4Kmzjt/4/zUDEyE5tB1ZAnJdRGCRL+Fn5lv2zKQzrs0fXyFlcgskpDhW64ZcpwntbUn0q/EBw=@vger.kernel.org X-Gm-Message-State: AOJu0Ywm2/NT1NWA3hHvKPiHv0HCQdztWb/8gLQrt0T7dPpdFCrSQ2fk kkAIZNhs0oknzc8hq9bbJt8Gcm6trJGzaXNmggZfuGrYTpBZMKEANafxtw== X-Gm-Gg: ASbGnctxJM+52QmNFgb/Z8zdbFOvwRuB4hkSWqprn3/a6QhnYGWSY1SHi66yMzOeBHS 91viKfPy2hFtZLgDW5gO0gnTnFNQFYtOdNBsw/xgAM4OKiGzVwKrZdkAl6a8f31I6HnRDg359Ff jvN7Qr/6MochVfvc5G7vstH8qwtR6O3nj/+RWQY8Z4Qp3DUC8rVh0eiOUR3vqjOJgkLLwItrr7v zuIpKJPbGLwPrczkEPBkX1D6gCwoR9L+vTzFqfq8hDa0t8F4UjCk1Hyc4QMybbtukxvoSmZF0mf /lmvvKJ5xhzB2HY2Z5bYTp0suSBJpwC/6rWrRorUxcKtK8uuzQQ= X-Google-Smtp-Source: AGHT+IF8FNELQILeKnXkaoYyKgX5j1AV5slhoBBsRzfDYVxVDrcKb8VfMpgJzmJF+NGBZiVwPpv2iQ== X-Received: by 2002:a05:600c:4587:b0:434:ffb2:f9cf with SMTP id 5b1f17b1804b1-43960ecb02cmr77864185e9.14.1739533660649; Fri, 14 Feb 2025 03:47:40 -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.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Feb 2025 03:47:39 -0800 (PST) From: Dave Penkler To: gregkh@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Dave Penkler Subject: [PATCH 06/17] staging: gpib: fluke console messaging cleanup Date: Fri, 14 Feb 2025 12:46:57 +0100 Message-ID: <20250214114708.28947-7-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 "fluke_gpib" in platform_driver struct. Remove commented printk's. Change pr_err to dev_err wherever possible Remove "fluke_gpib:" prefix in messages since this is printed with the module name. Correct dev_err message erroneously containing cb7210 identifier. Signed-off-by: Dave Penkler --- drivers/staging/gpib/eastwood/fluke_gpib.c | 90 +++++++--------------- 1 file changed, 27 insertions(+), 63 deletions(-) diff --git a/drivers/staging/gpib/eastwood/fluke_gpib.c b/drivers/staging/g= pib/eastwood/fluke_gpib.c index d5b1a03abf11..012ce9cb8999 100644 --- a/drivers/staging/gpib/eastwood/fluke_gpib.c +++ b/drivers/staging/gpib/eastwood/fluke_gpib.c @@ -7,6 +7,10 @@ * copyright: (C) 2006, 2010, 2015 Fluke Corporation *************************************************************************= **/ =20 +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#define dev_fmt pr_fmt +#define DRV_NAME KBUILD_MODNAME + #include "fluke_gpib.h" =20 #include "gpibP.h" @@ -263,9 +267,9 @@ static int wait_for_read(gpib_board_t *board) if (wait_event_interruptible(board->wait, lacs_or_read_ready(board) || test_bit(DEV_CLEAR_BN, &nec_priv->state) || - test_bit(TIMO_NUM, &board->status))) { + test_bit(TIMO_NUM, &board->status))) retval =3D -ERESTARTSYS; - } + if (test_bit(TIMO_NUM, &board->status)) retval =3D -ETIMEDOUT; if (test_and_clear_bit(DEV_CLEAR_BN, &nec_priv->state)) @@ -316,20 +320,17 @@ static int wait_for_data_out_ready(gpib_board_t *boar= d) struct fluke_priv *e_priv =3D board->private_data; struct nec7210_priv *nec_priv =3D &e_priv->nec7210_priv; int retval =3D 0; -// printk("%s: enter\n", __FUNCTION__); =20 if (wait_event_interruptible(board->wait, (test_bit(TACS_NUM, &board->status) && source_handshake_is_sgns(e_priv)) || test_bit(DEV_CLEAR_BN, &nec_priv->state) || - test_bit(TIMO_NUM, &board->status))) { + test_bit(TIMO_NUM, &board->status))) retval =3D -ERESTARTSYS; - } if (test_bit(TIMO_NUM, &board->status)) retval =3D -ETIMEDOUT; if (test_and_clear_bit(DEV_CLEAR_BN, &nec_priv->state)) retval =3D -EINTR; -// printk("%s: exit, retval=3D%i\n", __FUNCTION__, retval); return retval; } =20 @@ -338,7 +339,6 @@ static int wait_for_sids_or_sgns(gpib_board_t *board) struct fluke_priv *e_priv =3D board->private_data; struct nec7210_priv *nec_priv =3D &e_priv->nec7210_priv; int retval =3D 0; -// printk("%s: enter\n", __FUNCTION__); =20 if (wait_event_interruptible(board->wait, source_handshake_is_sids_or_sgns(e_priv) || @@ -350,7 +350,6 @@ static int wait_for_sids_or_sgns(gpib_board_t *board) retval =3D -ETIMEDOUT; if (test_and_clear_bit(DEV_CLEAR_BN, &nec_priv->state)) retval =3D -EINTR; -// printk("%s: exit, retval=3D%i\n", __FUNCTION__, retval); return retval; } =20 @@ -362,7 +361,6 @@ static void fluke_dma_callback(void *arg) unsigned long flags; =20 spin_lock_irqsave(&board->spinlock, flags); -// printk("%s: enter\n", __FUNCTION__); =20 nec7210_set_reg_bits(nec_priv, IMR1, HR_DOIE | HR_DIIE, HR_DOIE | HR_DIIE= ); wake_up_interruptible(&board->wait); @@ -370,7 +368,7 @@ static void fluke_dma_callback(void *arg) fluke_gpib_internal_interrupt(board); clear_bit(DMA_WRITE_IN_PROGRESS_BN, &nec_priv->state); clear_bit(DMA_READ_IN_PROGRESS_BN, &nec_priv->state); -// printk("%s: exit\n", __FUNCTION__); + spin_unlock_irqrestore(&board->spinlock, flags); } =20 @@ -385,7 +383,7 @@ static int fluke_dma_write(gpib_board_t *board, uint8_t= *buffer, size_t length, struct dma_async_tx_descriptor *tx_desc; =20 *bytes_written =3D 0; -// printk("%s: enter\n", __FUNCTION__); + if (WARN_ON_ONCE(length > e_priv->dma_buffer_size)) return -EFAULT; dmaengine_terminate_all(e_priv->dma_channel); @@ -403,7 +401,7 @@ static int fluke_dma_write(gpib_board_t *board, uint8_t= *buffer, size_t length, tx_desc =3D dmaengine_prep_slave_single(e_priv->dma_channel, address, len= gth, DMA_MEM_TO_DEV, DMA_PREP_INTERRUPT | DMA_CTRL_ACK); if (!tx_desc) { - pr_err("fluke_gpib: failed to allocate dma transmit descriptor\n"); + dev_err(board->gpib_dev, "failed to allocate dma transmit descriptor\n"); retval =3D -ENOMEM; goto cleanup; } @@ -419,10 +417,8 @@ static int fluke_dma_write(gpib_board_t *board, uint8_= t *buffer, size_t length, clear_bit(WRITE_READY_BN, &nec_priv->state); set_bit(DMA_WRITE_IN_PROGRESS_BN, &nec_priv->state); =20 - // printk("%s: in spin lock\n", __FUNCTION__); spin_unlock_irqrestore(&board->spinlock, flags); =20 -// printk("%s: waiting for write.\n", __FUNCTION__); // suspend until message is sent if (wait_event_interruptible(board->wait, ((readl(e_priv->write_transfer_counter) & @@ -430,7 +426,6 @@ 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))) { - dev_dbg(board->gpib_dev, "gpib write interrupted!\n"); retval =3D -ERESTARTSYS; } if (test_bit(TIMO_NUM, &board->status)) @@ -459,7 +454,6 @@ static int fluke_dma_write(gpib_board_t *board, uint8_t= *buffer, size_t length, =20 cleanup: dma_unmap_single(board->dev, address, length, DMA_TO_DEVICE); -// printk("%s: exit, retval=3D%d\n", __FUNCTION__, retval); return retval; } =20 @@ -474,7 +468,7 @@ static int fluke_accel_write(gpib_board_t *board, uint8= _t *buffer, size_t length size_t dma_remainder =3D remainder; =20 if (!e_priv->dma_channel) { - pr_err("fluke_gpib: No dma channel available, cannot do accel write."); + dev_err(board->gpib_dev, "No dma channel available, cannot do accel writ= e."); return -ENXIO; } =20 @@ -486,7 +480,6 @@ static int fluke_accel_write(gpib_board_t *board, uint8= _t *buffer, size_t length =20 if (send_eoi) --dma_remainder; -// printk("%s: entering while loop\n", __FUNCTION__); =20 while (dma_remainder > 0) { size_t num_bytes; @@ -512,7 +505,7 @@ static int fluke_accel_write(gpib_board_t *board, uint8= _t *buffer, size_t length //handle sending of last byte with eoi if (send_eoi) { size_t num_bytes; - // printk("%s: handling last byte\n", __FUNCTION__); + if (WARN_ON_ONCE(remainder !=3D 1)) return -EFAULT; =20 @@ -533,7 +526,6 @@ static int fluke_accel_write(gpib_board_t *board, uint8= _t *buffer, size_t length return retval; remainder -=3D num_bytes; } -// printk("%s: bytes send=3D%i\n", __FUNCTION__, (int)(length - remainder)= ); return 0; } =20 @@ -544,7 +536,7 @@ static int fluke_get_dma_residue(struct dma_chan *chan,= dma_cookie_t cookie) =20 result =3D dmaengine_pause(chan); if (result < 0) { - pr_err("fluke_gpib: dma pause failed?\n"); + pr_err("dma pause failed?\n"); return result; } dmaengine_tx_status(chan, cookie, &state); @@ -567,10 +559,6 @@ static int fluke_dma_read(gpib_board_t *board, uint8_t= *buffer, int i; static const int timeout =3D 10; =20 - // printk("%s: enter, bus_address=3D0x%x, length=3D%i\n", __FUNCTION__, - // (unsigned)bus_address, - // (int)length); - *bytes_read =3D 0; *end =3D 0; if (length =3D=3D 0) @@ -589,7 +577,7 @@ static int fluke_dma_read(gpib_board_t *board, uint8_t = *buffer, bus_address, length, DMA_DEV_TO_MEM, DMA_PREP_INTERRUPT | DMA_CTRL_ACK); if (!tx_desc) { - pr_err("fluke_gpib: failed to allocate dma transmit descriptor\n"); + dev_err(board->gpib_dev, "failed to allocate dma transmit descriptor\n"); dma_unmap_single(NULL, bus_address, length, DMA_FROM_DEVICE); return -EIO; } @@ -608,14 +596,12 @@ static int fluke_dma_read(gpib_board_t *board, uint8_= t *buffer, clear_bit(READ_READY_BN, &nec_priv->state); =20 spin_unlock_irqrestore(&board->spinlock, flags); -// printk("waiting for data transfer.\n"); // wait for data to transfer if (wait_event_interruptible(board->wait, test_bit(DMA_READ_IN_PROGRESS_BN, &nec_priv->state) =3D=3D 0 || test_bit(RECEIVED_END_BN, &nec_priv->state) || test_bit(DEV_CLEAR_BN, &nec_priv->state) || test_bit(TIMO_NUM, &board->status))) { - pr_warn("fluke: dma read wait interrupted\n"); retval =3D -ERESTARTSYS; } if (test_bit(TIMO_NUM, &board->status)) @@ -682,10 +668,6 @@ static int fluke_accel_read(gpib_board_t *board, uint8= _t *buffer, size_t length, int retval =3D 0; size_t dma_nbytes; =20 -/* printk("%s: enter, buffer=3D0x%p, length=3D%i\n", __FUNCTION__, - * buffer, (int)length); - * printk("\t dma_buffer=3D0x%p\n", e_priv->dma_buffer); - */ *end =3D 0; *bytes_read =3D 0; =20 @@ -699,7 +681,6 @@ static int fluke_accel_read(gpib_board_t *board, uint8_= t *buffer, size_t length, =20 nec7210_release_rfd_holdoff(board, nec_priv); =20 -// printk("%s: entering while loop\n", __FUNCTION__); while (remain > 0) { transfer_size =3D (e_priv->dma_buffer_size < remain) ? e_priv->dma_buffer_size : remain; @@ -709,14 +690,12 @@ static int fluke_accel_read(gpib_board_t *board, uint= 8_t *buffer, size_t length, *bytes_read +=3D dma_nbytes; if (*end) break; - if (retval < 0) { -// printk("%s: early exit, retval=3D%i\n", __FUNCTION__, (int)retval); + if (retval < 0) return retval; - } if (need_resched()) schedule(); } -// printk("%s: exit, retval=3D%i\n", __FUNCTION__, (int)retval); + return retval; } =20 @@ -830,13 +809,6 @@ irqreturn_t fluke_gpib_internal_interrupt(gpib_board_t= *board) =20 if (nec7210_interrupt_have_status(board, nec_priv, status1, status2) =3D= =3D IRQ_HANDLED) retval =3D IRQ_HANDLED; -/* - * if((status1 & nec_priv->reg_bits[IMR1]) || - * (status2 & (nec_priv->reg_bits[IMR2] & IMR2_ENABLE_INTR_MASK))) - * { - * printk("fluke: status1 0x%x, status2 0x%x\n", status1, status2); - * } - */ =20 if (read_byte(nec_priv, ADR0) & DATA_IN_STATUS) { if (test_bit(RFD_HOLDOFF_BN, &nec_priv->state)) @@ -954,7 +926,7 @@ static int fluke_init(struct fluke_priv *e_priv, gpib_b= oard_t *board, int handsh =20 /* poll so we can detect ATN changes */ if (gpib_request_pseudo_irq(board, fluke_gpib_interrupt)) { - pr_err("fluke_gpib: failed to allocate pseudo_irq\n"); + dev_err(board->gpib_dev, "failed to allocate pseudo_irq\n"); return -EINVAL; } =20 @@ -984,7 +956,7 @@ static int fluke_attach_impl(gpib_board_t *board, const= gpib_board_config_t *con dma_cap_mask_t dma_cap; =20 if (!fluke_gpib_pdev) { - pr_err("No gpib platform device was found, attach failed.\n"); + dev_err(board->gpib_dev, "No fluke device was found, attach failed.\n"); return -ENODEV; } =20 @@ -999,7 +971,7 @@ static int fluke_attach_impl(gpib_board_t *board, const= gpib_board_config_t *con =20 res =3D platform_get_resource(fluke_gpib_pdev, IORESOURCE_MEM, 0); if (!res) { - dev_err(&fluke_gpib_pdev->dev, "Unable to locate mmio resource for cb721= 0 gpib\n"); + dev_err(&fluke_gpib_pdev->dev, "Unable to locate mmio resource\n"); return -ENODEV; } =20 @@ -1012,10 +984,7 @@ static int fluke_attach_impl(gpib_board_t *board, con= st gpib_board_config_t *con e_priv->gpib_iomem_res =3D res; =20 nec_priv->mmiobase =3D ioremap(e_priv->gpib_iomem_res->start, - resource_size(e_priv->gpib_iomem_res)); - pr_info("gpib: mmiobase %llx remapped to %p, length=3D%d\n", - (u64)e_priv->gpib_iomem_res->start, - nec_priv->mmiobase, (int)resource_size(e_priv->gpib_iomem_res)); + resource_size(e_priv->gpib_iomem_res)); if (!nec_priv->mmiobase) { dev_err(&fluke_gpib_pdev->dev, "Could not map I/O memory\n"); return -ENOMEM; @@ -1050,19 +1019,14 @@ static int fluke_attach_impl(gpib_board_t *board, c= onst gpib_board_config_t *con =20 e_priv->write_transfer_counter =3D ioremap(e_priv->write_transfer_counter= _res->start, resource_size(e_priv->write_transfer_counter_res)); - pr_info("gpib: write transfer counter %lx remapped to %p, length=3D%d\n", - (unsigned long)e_priv->write_transfer_counter_res->start, - e_priv->write_transfer_counter, - (int)resource_size(e_priv->write_transfer_counter_res)); if (!e_priv->write_transfer_counter) { dev_err(&fluke_gpib_pdev->dev, "Could not map I/O memory\n"); return -ENOMEM; } =20 irq =3D platform_get_irq(fluke_gpib_pdev, 0); - pr_info("gpib: irq %d\n", irq); if (irq < 0) { - dev_err(&fluke_gpib_pdev->dev, "fluke_gpib: request for IRQ failed\n"); + dev_err(&fluke_gpib_pdev->dev, "failed to obtain IRQ\n"); return -EBUSY; } retval =3D request_irq(irq, fluke_gpib_interrupt, isr_flags, fluke_gpib_p= dev->name, board); @@ -1078,7 +1042,7 @@ static int fluke_attach_impl(gpib_board_t *board, con= st gpib_board_config_t *con dma_cap_set(DMA_SLAVE, dma_cap); e_priv->dma_channel =3D dma_request_channel(dma_cap, gpib_dma_channel_fil= ter, NULL); if (!e_priv->dma_channel) { - pr_err("fluke_gpib: failed to allocate a dma channel.\n"); + dev_err(board->gpib_dev, "failed to allocate a dma channel.\n"); // we don't error out here because unaccel interface will still // work without dma } @@ -1142,7 +1106,7 @@ MODULE_DEVICE_TABLE(of, fluke_gpib_of_match); =20 static struct platform_driver fluke_gpib_platform_driver =3D { .driver =3D { - .name =3D "fluke_gpib", + .name =3D DRV_NAME, .of_match_table =3D fluke_gpib_of_match, }, .probe =3D &fluke_gpib_probe @@ -1154,25 +1118,25 @@ static int __init fluke_init_module(void) =20 result =3D platform_driver_register(&fluke_gpib_platform_driver); if (result) { - pr_err("fluke_gpib: platform_driver_register failed: error =3D %d\n", re= sult); + pr_err("platform_driver_register failed: error =3D %d\n", result); return result; } =20 result =3D gpib_register_driver(&fluke_unaccel_interface, THIS_MODULE); if (result) { - pr_err("fluke_gpib: gpib_register_driver failed: error =3D %d\n", result= ); + pr_err("gpib_register_driver failed: error =3D %d\n", result); goto err_unaccel; } =20 result =3D gpib_register_driver(&fluke_hybrid_interface, THIS_MODULE); if (result) { - pr_err("fluke_gpib: gpib_register_driver failed: error =3D %d\n", result= ); + pr_err("gpib_register_driver failed: error =3D %d\n", result); goto err_hybrid; } =20 result =3D gpib_register_driver(&fluke_interface, THIS_MODULE); if (result) { - pr_err("fluke_gpib: gpib_register_driver failed: error =3D %d\n", result= ); + pr_err("gpib_register_driver failed: error =3D %d\n", result); goto err_interface; } =20 --=20 2.48.1 From nobody Thu Mar 13 08:35:05 2025 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (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 B4D83263F59 for ; Fri, 14 Feb 2025 11:47:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739533666; cv=none; b=V9iTBgW7ZJaFTFJu39Ox3JP+0QAevhM54feXOZ7n342+WYzD/pO6seUVS62lbibhMKlrEmlWxs2Y6BZtGI0UWos8lCu81qwvffKdwWDhOXrukN5A/9gj8aRSNGxNMfUYKAiTUaxQXPUeJXC6XBjBC4jhz31d8gXZ9i7RbuXAdtE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739533666; c=relaxed/simple; bh=X2V/AscPrGN6rCLa9CXchKbt2yvYLR/HTYJSnSh8nH0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aa0O349O4rKMTkd28NAc+c/YxY5YCOHPcsakTb9EsRoWbL8828wfy44mtpAu6NNugpZvs/4mshZJREFFCozYKLIqzdCSeEhOJL7xcALaBO2X3O19LNfu86aix449x3l0QNYy/QOkEXYl+DDBIATvLzcxtTBi2SRMbRGn8RhmEXQ= 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=Qhf4pyJT; arc=none smtp.client-ip=209.85.128.51 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="Qhf4pyJT" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-436ce2ab251so14035955e9.1 for ; Fri, 14 Feb 2025 03:47:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739533662; x=1740138462; 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=UPXYyRRrUg3eqcwUnNZ+3WfzPF/LnMYiUnRdR/lD1n0=; b=Qhf4pyJTre0LFLNZiR3X7NAZLbCNGIWnPs3fdtfbzk2WhIsR3knnqwyQgnppJ7/R3n K/JxmeEdmcClyDeg9N7Z4vw+ncvDOrJtSZkpSSleV2b9+X7CyMdVApZob05Fbf1YpvDS gCnGB0WDylB0suKnMxi0JBpNEcZ8bMgCn3lNWFaFd7cUYSr15twZKrpe7iAlkbyV7WJM yVo1ulHpnSF7r2zeXO3RggQIf1IJDIooyb/YbFNoCa351HwUF8wm71VGieZdr5FMoOXT /FMbITlnx4kNsEVjP+Uq45BWY9eBjhxtH12ovrUkPHp6zFYngDIXwKAUaYKQWYPzz7Ty 7/RA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739533662; x=1740138462; 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=UPXYyRRrUg3eqcwUnNZ+3WfzPF/LnMYiUnRdR/lD1n0=; b=vELwyx1+F0rltbr0VaEpU7sKlzFoRUdcxOdh9sZHtpgIUZGYpc29QzWYsrMfB7Ru5e giUdsPKpSf68zCZ4qco8S+PTsvJXaBcNNJzljtXZ3be9qHwIrdn09YdwqrhcukQnyJiN WnZ5FLcsoyJ3hilAm3gNAIfys+hesXpIShyl+l3gPFBlXYFOhMy+VaOksSeypqHZ1UJI b5xejC5iZWhdDvckcTnIp/8FMGLlxQ3gSc0dfwqigEHOdLF6JT4lty6QbjUUzRziofHR j9ZJMaIaSsQTiLKiwn9fohYRwUmh9XQddaeve1fVnnklcKNw7BtRIlyyoJmsLjxILlma RZuQ== X-Forwarded-Encrypted: i=1; AJvYcCV2KhmlO1+atH47SMKL5qDYxp6pXGRgLpIV8YRME2Pg5hU78YWaO7fEdKL3SpV9TnGomSxCH3veDYbdNyQ=@vger.kernel.org X-Gm-Message-State: AOJu0YyLTaV7rHYU16UyPvIkHIy8+FKLN3QwLy+NuJQJ7ApHZkRNCMtv 8b7aT6FIxzl/UjzQVuPEOMQmPbkJleAlQWYmJrm2e91BuRJnST6O X-Gm-Gg: ASbGnctfh1fAbpiKLTitEgl5C96U30G/CAYgDWhbM8VQ+ADd8wSZ/sgEW2oJtZsuhHq y5L29ipmYWYhQbZrnh4gu1oaCk33ItZSiXnl/Lwz5AtDvSZVL4WE652U8h0iccjqFBEupxRBj1/ Bq+X82qwn0xvt++GEFcNtUsMwSd5XTcfDUwkr3RtB91qtFLT2fFkrrlzyJ5x1mzUW0+WWuGMwMU omCaeT7tbpHh7adDX19v4pNIRrXPl1Qhw2cp9IdeNovCWNka4ywE41DQdGbRtfIbi2ceOTyB7LU kOHUrX3Br/EoEeB8gxdwigp/xsV0DhQv+F39ILM0cMvEA1cnbzs= X-Google-Smtp-Source: AGHT+IEWxbyp3feU463+AAXB3ggjhTJ0O4AkpwqK/PV7cnYXMcJfQCZBLfA+j+fBuOF1MEAGuiBJdQ== X-Received: by 2002:a05:600c:4e02:b0:439:65ce:4044 with SMTP id 5b1f17b1804b1-43965ce41camr55833245e9.10.1739533661764; Fri, 14 Feb 2025 03:47:41 -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.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Feb 2025 03:47:41 -0800 (PST) From: Dave Penkler To: gregkh@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Dave Penkler Subject: [PATCH 07/17] staging: gpib: fmh console messaging cleanup Date: Fri, 14 Feb 2025 12:46:58 +0100 Message-ID: <20250214114708.28947-8-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 "fmh_gpib" in platform_driver and pci_driver structs. Remove commented printk's. Change pr_err to dev_err wherever possible Remove "fmh_gpib_gpib:" prefix in messages since this is printed with the module name. Remove write interrupted dev_dbg messages. Remove read wait interrupted pr_warn. Change dev_notice attach to dev_dbg Change dev_info to dev_dbg. Correct dev_err message erroneously containing cb7210 identifier. Signed-off-by: Dave Penkler --- drivers/staging/gpib/fmh_gpib/fmh_gpib.c | 140 +++++++++-------------- 1 file changed, 53 insertions(+), 87 deletions(-) diff --git a/drivers/staging/gpib/fmh_gpib/fmh_gpib.c b/drivers/staging/gpi= b/fmh_gpib/fmh_gpib.c index f950e7cdd8f8..d62c83368518 100644 --- a/drivers/staging/gpib/fmh_gpib/fmh_gpib.c +++ b/drivers/staging/gpib/fmh_gpib/fmh_gpib.c @@ -12,6 +12,10 @@ * (C) 2017 Frank Mori Hess *************************************************************************= **/ =20 +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#define dev_fmt pr_fmt +#define DRV_NAME KBUILD_MODNAME + #include "fmh_gpib.h" =20 #include "gpibP.h" @@ -334,7 +338,6 @@ static int wait_for_data_out_ready(gpib_board_t *board) struct fmh_priv *e_priv =3D board->private_data; struct nec7210_priv *nec_priv =3D &e_priv->nec7210_priv; int retval =3D 0; -// printk("%s: enter\n", __FUNCTION__); =20 if (wait_event_interruptible(board->wait, (test_bit(TACS_NUM, &board->status) && @@ -348,7 +351,7 @@ static int wait_for_data_out_ready(gpib_board_t *board) retval =3D -ETIMEDOUT; if (test_and_clear_bit(DEV_CLEAR_BN, &nec_priv->state)) retval =3D -EINTR; -// printk("%s: exit, retval=3D%i\n", __FUNCTION__, retval); + return retval; } =20 @@ -360,7 +363,6 @@ static void fmh_gpib_dma_callback(void *arg) unsigned long flags; =20 spin_lock_irqsave(&board->spinlock, flags); -// printk("%s: enter\n", __FUNCTION__); =20 nec7210_set_reg_bits(nec_priv, IMR1, HR_DOIE | HR_DIIE, HR_DOIE | HR_DIIE= ); wake_up_interruptible(&board->wait); @@ -370,7 +372,6 @@ static void fmh_gpib_dma_callback(void *arg) clear_bit(DMA_WRITE_IN_PROGRESS_BN, &nec_priv->state); clear_bit(DMA_READ_IN_PROGRESS_BN, &nec_priv->state); =20 - // printk("%s: exit\n", __FUNCTION__); spin_unlock_irqrestore(&board->spinlock, flags); } =20 @@ -399,14 +400,13 @@ static int fmh_gpib_dma_write(gpib_board_t *board, ui= nt8_t *buffer, size_t lengt struct dma_async_tx_descriptor *tx_desc; =20 *bytes_written =3D 0; -// printk("%s: enter\n", __FUNCTION__); if (WARN_ON_ONCE(length > e_priv->dma_buffer_size)) return -EFAULT; dmaengine_terminate_all(e_priv->dma_channel); memcpy(e_priv->dma_buffer, buffer, length); address =3D dma_map_single(board->dev, e_priv->dma_buffer, length, DMA_TO= _DEVICE); if (dma_mapping_error(board->dev, address)) - pr_err("dma mapping error in dma write!\n"); + dev_err(board->gpib_dev, "dma mapping error in dma write!\n"); /* program dma controller */ retval =3D fmh_gpib_config_dma(board, 1); if (retval) @@ -415,7 +415,7 @@ static int fmh_gpib_dma_write(gpib_board_t *board, uint= 8_t *buffer, size_t lengt tx_desc =3D dmaengine_prep_slave_single(e_priv->dma_channel, address, len= gth, DMA_MEM_TO_DEV, DMA_PREP_INTERRUPT | DMA_CTRL_ACK); if (!tx_desc) { - pr_err("fmh_gpib_gpib: failed to allocate dma transmit descriptor\n"); + dev_err(board->gpib_dev, "failed to allocate dma transmit descriptor\n"); retval =3D -ENOMEM; goto cleanup; } @@ -432,19 +432,17 @@ static int fmh_gpib_dma_write(gpib_board_t *board, ui= nt8_t *buffer, size_t lengt dma_async_issue_pending(e_priv->dma_channel); clear_bit(WRITE_READY_BN, &nec_priv->state); set_bit(DMA_WRITE_IN_PROGRESS_BN, &nec_priv->state); -// printk("%s: in spin lock\n", __FUNCTION__); + spin_unlock_irqrestore(&board->spinlock, flags); =20 -// printk("%s: waiting for write.\n", __FUNCTION__); // suspend until message is sent if (wait_event_interruptible(board->wait, fmh_gpib_all_bytes_are_sent(e_priv) || test_bit(BUS_ERROR_BN, &nec_priv->state) || test_bit(DEV_CLEAR_BN, &nec_priv->state) || - test_bit(TIMO_NUM, &board->status))) { - dev_dbg(board->gpib_dev, "gpib write interrupted!\n"); + test_bit(TIMO_NUM, &board->status))) retval =3D -ERESTARTSYS; - } + if (test_bit(TIMO_NUM, &board->status)) retval =3D -ETIMEDOUT; if (test_and_clear_bit(DEV_CLEAR_BN, &nec_priv->state)) @@ -464,12 +462,8 @@ static int fmh_gpib_dma_write(gpib_board_t *board, uin= t8_t *buffer, size_t lengt fifo_xfer_counter_mask); if (WARN_ON_ONCE(*bytes_written > length)) return -EFAULT; - /* printk("length=3D%i, *bytes_written=3D%i, residue=3D%i, retval=3D%i\n", - * length, *bytes_written, get_dma_residue(e_priv->dma_channel), retval); - */ cleanup: dma_unmap_single(board->dev, address, length, DMA_TO_DEVICE); -// printk("%s: exit, retval=3D%d\n", __FUNCTION__, retval); return retval; } =20 @@ -484,7 +478,7 @@ static int fmh_gpib_accel_write(gpib_board_t *board, ui= nt8_t *buffer, size_t dma_remainder =3D remainder; =20 if (!e_priv->dma_channel) { - pr_err("fmh_gpib_gpib: No dma channel available, cannot do accel write."= ); + dev_err(board->gpib_dev, "No dma channel available, cannot do accel writ= e."); return -ENXIO; } =20 @@ -498,7 +492,6 @@ static int fmh_gpib_accel_write(gpib_board_t *board, ui= nt8_t *buffer, =20 if (send_eoi) --dma_remainder; -// printk("%s: entering while loop\n", __FUNCTION__); =20 while (dma_remainder > 0) { size_t num_bytes; @@ -524,7 +517,7 @@ static int fmh_gpib_accel_write(gpib_board_t *board, ui= nt8_t *buffer, //handle sending of last byte with eoi if (send_eoi) { size_t num_bytes; - // printk("%s: handling last byte\n", __FUNCTION__); + if (WARN_ON_ONCE(remainder !=3D 1)) return -EFAULT; =20 @@ -545,7 +538,6 @@ static int fmh_gpib_accel_write(gpib_board_t *board, ui= nt8_t *buffer, return retval; remainder -=3D num_bytes; } -// printk("%s: bytes send=3D%i\n", __FUNCTION__, (int)(length - remainder)= ); return 0; } =20 @@ -556,7 +548,7 @@ static int fmh_gpib_get_dma_residue(struct dma_chan *ch= an, dma_cookie_t cookie) =20 result =3D dmaengine_pause(chan); if (result < 0) { - pr_err("fmh_gpib_gpib: dma pause failed?\n"); + pr_err("dma pause failed?\n"); return result; } dmaengine_tx_status(chan, cookie, &state); @@ -570,7 +562,6 @@ static int wait_for_tx_fifo_half_empty(gpib_board_t *bo= ard) struct fmh_priv *e_priv =3D board->private_data; struct nec7210_priv *nec_priv =3D &e_priv->nec7210_priv; int retval =3D 0; -// printk("%s: enter\n", __FUNCTION__); =20 if (wait_event_interruptible(board->wait, (test_bit(TACS_NUM, &board->status) && @@ -584,7 +575,7 @@ static int wait_for_tx_fifo_half_empty(gpib_board_t *bo= ard) retval =3D -ETIMEDOUT; if (test_and_clear_bit(DEV_CLEAR_BN, &nec_priv->state)) retval =3D -EINTR; -// printk("%s: exit, retval=3D%i\n", __FUNCTION__, retval); + return retval; } =20 @@ -600,7 +591,6 @@ static int fmh_gpib_fifo_write_countable(gpib_board_t *= board, uint8_t *buffer, unsigned int remainder; =20 *bytes_written =3D 0; -// printk("%s: enter\n", __FUNCTION__); if (WARN_ON_ONCE(length > fifo_xfer_counter_mask)) return -EFAULT; =20 @@ -635,10 +625,9 @@ static int fmh_gpib_fifo_write_countable(gpib_board_t = *board, uint8_t *buffer, fmh_gpib_all_bytes_are_sent(e_priv) || test_bit(BUS_ERROR_BN, &nec_priv->state) || test_bit(DEV_CLEAR_BN, &nec_priv->state) || - test_bit(TIMO_NUM, &board->status))) { - dev_dbg(board->gpib_dev, "gpib write interrupted!\n"); + test_bit(TIMO_NUM, &board->status))) retval =3D -ERESTARTSYS; - } + if (test_bit(TIMO_NUM, &board->status)) retval =3D -ETIMEDOUT; if (test_and_clear_bit(DEV_CLEAR_BN, &nec_priv->state)) @@ -655,11 +644,7 @@ static int fmh_gpib_fifo_write_countable(gpib_board_t = *board, uint8_t *buffer, fifo_xfer_counter_mask); if (WARN_ON_ONCE(*bytes_written > length)) return -EFAULT; - /* printk("length=3D%i, *bytes_written=3D%i, residue=3D%i, retval=3D%i\n", - * length, *bytes_written, get_dma_residue(e_priv->dma_channel), retval); - */ =20 -// printk("%s: exit, retval=3D%d\n", __FUNCTION__, retval); return retval; } =20 @@ -678,8 +663,6 @@ static int fmh_gpib_fifo_write(gpib_board_t *board, uin= t8_t *buffer, size_t leng =20 clear_bit(DEV_CLEAR_BN, &nec_priv->state); // XXX FIXME =20 -// printk("%s: entering while loop\n", __FUNCTION__); - while (remainder > 0) { size_t num_bytes; int last_pass; @@ -708,7 +691,7 @@ static int fmh_gpib_fifo_write(gpib_board_t *board, uin= t8_t *buffer, size_t leng if (need_resched()) schedule(); } -// printk("%s: bytes send=3D%i\n", __FUNCTION__, (int)(length - remainder)= ); + return retval; } =20 @@ -725,10 +708,6 @@ static int fmh_gpib_dma_read(gpib_board_t *board, uint= 8_t *buffer, struct dma_async_tx_descriptor *tx_desc; dma_cookie_t dma_cookie; =20 - // printk("%s: enter, bus_address=3D0x%x, length=3D%i\n", __FUNCTION__, - //(unsigned)bus_address, -// (int)length); - *bytes_read =3D 0; *end =3D 0; if (length =3D=3D 0) @@ -737,7 +716,7 @@ static int fmh_gpib_dma_read(gpib_board_t *board, uint8= _t *buffer, bus_address =3D dma_map_single(board->dev, e_priv->dma_buffer, length, DMA_FROM_DEVICE); if (dma_mapping_error(board->dev, bus_address)) - pr_err("dma mapping error in dma read!"); + dev_err(board->gpib_dev, "dma mapping error in dma read!"); =20 /* program dma controller */ retval =3D fmh_gpib_config_dma(board, 0); @@ -749,7 +728,7 @@ static int fmh_gpib_dma_read(gpib_board_t *board, uint8= _t *buffer, length, DMA_DEV_TO_MEM, DMA_PREP_INTERRUPT | DMA_CTRL_ACK); if (!tx_desc) { - pr_err("fmh_gpib_gpib: failed to allocate dma transmit descriptor\n"); + dev_err(board->gpib_dev, "failed to allocate dma transmit descriptor\n"); dma_unmap_single(board->dev, bus_address, length, DMA_FROM_DEVICE); return -EIO; } @@ -769,7 +748,7 @@ static int fmh_gpib_dma_read(gpib_board_t *board, uint8= _t *buffer, set_bit(DMA_READ_IN_PROGRESS_BN, &nec_priv->state); =20 spin_unlock_irqrestore(&board->spinlock, flags); -// printk("waiting for data transfer.\n"); + // wait for data to transfer wait_retval =3D wait_event_interruptible(board->wait, test_bit(DMA_READ_IN_PROGRESS_BN, &nec_priv->state) @@ -777,10 +756,9 @@ static int fmh_gpib_dma_read(gpib_board_t *board, uint= 8_t *buffer, test_bit(RECEIVED_END_BN, &nec_priv->state) || test_bit(DEV_CLEAR_BN, &nec_priv->state) || test_bit(TIMO_NUM, &board->status)); - if (wait_retval) { - pr_warn("fmh_gpib: dma read wait interrupted\n"); + if (wait_retval) retval =3D -ERESTARTSYS; - } + if (test_bit(TIMO_NUM, &board->status)) retval =3D -ETIMEDOUT; if (test_bit(DEV_CLEAR_BN, &nec_priv->state)) @@ -825,8 +803,6 @@ static int fmh_gpib_dma_read(gpib_board_t *board, uint8= _t *buffer, *end =3D 1; } spin_unlock_irqrestore(&board->spinlock, flags); -// printk("\tbytes_read=3D%i, residue=3D%i, end=3D%i, retval=3D%i, wait_re= tval=3D%i\n", -// *bytes_read, residue, *end, retval, wait_retval); =20 return retval; } @@ -925,10 +901,6 @@ static int fmh_gpib_fifo_read_countable(gpib_board_t *= board, uint8_t *buffer, struct nec7210_priv *nec_priv =3D &e_priv->nec7210_priv; int retval =3D 0; =20 - // printk("%s: enter, bus_address=3D0x%x, length=3D%i\n", __FUNCTION__, - // (unsigned)bus_address, -// (int)length); - *bytes_read =3D 0; *end =3D 0; if (length =3D=3D 0) @@ -977,9 +949,6 @@ static int fmh_gpib_fifo_read_countable(gpib_board_t *b= oard, uint8_t *buffer, *end =3D 1; } =20 -// printk("\tbytes_read=3D%i, end=3D%i, retval=3D%i, wait_retval=3D%i\n", -// *bytes_read, *end, retval, wait_retval); - return retval; } =20 @@ -1376,7 +1345,7 @@ static int fmh_gpib_device_match(struct device *dev, = const void *data) if (config->serial_number) return 0; =20 - dev_notice(dev, "matched: %s\n", of_node_full_name(dev_of_node((dev)))); + dev_dbg(dev, "matched: %s\n", of_node_full_name(dev_of_node((dev)))); return 1; } =20 @@ -1393,7 +1362,7 @@ static int fmh_gpib_attach_impl(gpib_board_t *board, = const gpib_board_config_t * board->dev =3D driver_find_device(&fmh_gpib_platform_driver.driver, NULL, (const void *)config, &fmh_gpib_device_match); if (!board->dev) { - pr_err("No matching fmh_gpib_core device was found, attach failed."); + dev_err(board->gpib_dev, "No matching fmh_gpib_core device was found, at= tach failed."); return -ENODEV; } // currently only used to mark the device as already attached @@ -1409,7 +1378,7 @@ static int fmh_gpib_attach_impl(gpib_board_t *board, = const gpib_board_config_t * =20 res =3D platform_get_resource_byname(pdev, IORESOURCE_MEM, "gpib_control_= status"); if (!res) { - dev_err(board->dev, "Unable to locate mmio resource for cb7210 gpib\n"); + dev_err(board->dev, "Unable to locate mmio resource\n"); return -ENODEV; } =20 @@ -1422,13 +1391,13 @@ static int fmh_gpib_attach_impl(gpib_board_t *board= , const gpib_board_config_t * e_priv->gpib_iomem_res =3D res; =20 nec_priv->mmiobase =3D ioremap(e_priv->gpib_iomem_res->start, - resource_size(e_priv->gpib_iomem_res)); + resource_size(e_priv->gpib_iomem_res)); if (!nec_priv->mmiobase) { - dev_err(board->dev, "Could not map I/O memory for gpib\n"); + dev_err(board->dev, "Could not map I/O memory\n"); return -ENOMEM; } - dev_info(board->dev, "iobase %pr remapped to %p\n", - e_priv->gpib_iomem_res, nec_priv->mmiobase); + dev_dbg(board->dev, "iobase %pr remapped to %p\n", + e_priv->gpib_iomem_res, nec_priv->mmiobase); =20 res =3D platform_get_resource_byname(pdev, IORESOURCE_MEM, "dma_fifos"); if (!res) { @@ -1448,14 +1417,13 @@ static int fmh_gpib_attach_impl(gpib_board_t *board= , const gpib_board_config_t * dev_err(board->dev, "Could not map I/O memory for fifos\n"); return -ENOMEM; } - dev_info(board->dev, "dma fifos 0x%lx remapped to %p, length=3D%ld\n", - (unsigned long)e_priv->dma_port_res->start, e_priv->fifo_base, - (unsigned long)resource_size(e_priv->dma_port_res)); + dev_dbg(board->dev, "dma fifos 0x%lx remapped to %p, length=3D%ld\n", + (unsigned long)e_priv->dma_port_res->start, e_priv->fifo_base, + (unsigned long)resource_size(e_priv->dma_port_res)); =20 irq =3D platform_get_irq(pdev, 0); - pr_info("gpib: irq %d\n", irq); if (irq < 0) { - dev_err(board->dev, "fmh_gpib_gpib: request for IRQ failed\n"); + dev_err(board->dev, "request for IRQ failed\n"); return -EBUSY; } retval =3D request_irq(irq, fmh_gpib_interrupt, IRQF_SHARED, pdev->name, = board); @@ -1546,7 +1514,7 @@ static int fmh_gpib_pci_attach_impl(gpib_board_t *boa= rd, const gpib_board_config pci_device =3D gpib_pci_get_device(config, BOGUS_PCI_VENDOR_ID_FLUKE, BOGUS_PCI_DEVICE_ID_FLUKE_BLADERUNNER, NULL); if (!pci_device) { - pr_err("No matching fmh_gpib_core pci device was found, attach failed."); + dev_err(board->gpib_dev, "No matching fmh_gpib_core pci device was found= , attach failed."); return -ENODEV; } board->dev =3D &pci_device->dev; @@ -1563,34 +1531,32 @@ static int fmh_gpib_pci_attach_impl(gpib_board_t *b= oard, const gpib_board_config return -EIO; } e_priv->gpib_iomem_res =3D &pci_device->resource[gpib_control_status_pci_= resource_index]; - e_priv->dma_port_res =3D &pci_device->resource[gpib_fifo_pci_resource_in= dex]; + e_priv->dma_port_res =3D &pci_device->resource[gpib_fifo_pci_resource_ind= ex]; =20 nec_priv->mmiobase =3D ioremap(pci_resource_start(pci_device, - gpib_control_status_pci_resource_index), - pci_resource_len(pci_device, - gpib_control_status_pci_resource_index)); - dev_info(board->dev, "base address for gpib control/status registers rema= pped to 0x%p\n", - nec_priv->mmiobase); + gpib_control_status_pci_resource_index), + pci_resource_len(pci_device, + gpib_control_status_pci_resource_index)); + dev_dbg(board->dev, "base address for gpib control/status registers remap= ped to 0x%p\n", + nec_priv->mmiobase); =20 if (e_priv->dma_port_res->flags & IORESOURCE_MEM) { e_priv->fifo_base =3D ioremap(pci_resource_start(pci_device, gpib_fifo_pci_resource_index), pci_resource_len(pci_device, gpib_fifo_pci_resource_index)); - dev_info(board->dev, "base address for gpib fifo registers remapped to 0= x%p\n", - e_priv->fifo_base); + dev_dbg(board->dev, "base address for gpib fifo registers remapped to 0x= %p\n", + e_priv->fifo_base); } else { e_priv->fifo_base =3D NULL; - dev_info(board->dev, "hardware has no gpib fifo registers.\n"); + dev_dbg(board->dev, "hardware has no gpib fifo registers.\n"); } =20 if (pci_device->irq) { retval =3D request_irq(pci_device->irq, fmh_gpib_interrupt, IRQF_SHARED, KBUILD_MODNAME, board); if (retval) { - dev_err(board->dev, - "cannot register interrupt handler err=3D%d\n", - retval); + dev_err(board->dev, "cannot register interrupt handler err=3D%d\n", ret= val); return retval; } } @@ -1615,7 +1581,7 @@ int fmh_gpib_pci_attach_holdoff_end(gpib_board_t *boa= rd, const gpib_board_config retval =3D fmh_gpib_pci_attach_impl(board, config, HR_HLDE); e_priv =3D board->private_data; if (retval =3D=3D 0 && e_priv && e_priv->supports_fifo_interrupts =3D=3D = 0) { - pr_err("fmh_gpib: your fmh_gpib_core does not appear to support fifo int= errupts. Try the fmh_gpib_pci_unaccel board type instead."); + dev_err(board->gpib_dev, "your fmh_gpib_core does not appear to support = fifo interrupts. Try the fmh_gpib_pci_unaccel board type instead."); return -EIO; } return retval; @@ -1662,7 +1628,7 @@ MODULE_DEVICE_TABLE(of, fmh_gpib_of_match); =20 static struct platform_driver fmh_gpib_platform_driver =3D { .driver =3D { - .name =3D "fmh_gpib", + .name =3D DRV_NAME, .owner =3D THIS_MODULE, .of_match_table =3D fmh_gpib_of_match, }, @@ -1681,7 +1647,7 @@ static const struct pci_device_id fmh_gpib_pci_match[= ] =3D { MODULE_DEVICE_TABLE(pci, fmh_gpib_pci_match); =20 static struct pci_driver fmh_gpib_pci_driver =3D { - .name =3D "fmh_gpib", + .name =3D DRV_NAME, .id_table =3D fmh_gpib_pci_match, .probe =3D &fmh_gpib_pci_probe }; @@ -1692,37 +1658,37 @@ static int __init fmh_gpib_init_module(void) =20 result =3D platform_driver_register(&fmh_gpib_platform_driver); if (result) { - pr_err("fmh_gpib: platform_driver_register failed: error =3D %d\n", resu= lt); + pr_err("platform_driver_register failed: error =3D %d\n", result); return result; } =20 result =3D pci_register_driver(&fmh_gpib_pci_driver); if (result) { - pr_err("fmh_gpib: pci_register_driver failed: error =3D %d\n", result); + pr_err("pci_register_driver failed: error =3D %d\n", result); goto err_pci_driver; } =20 result =3D gpib_register_driver(&fmh_gpib_unaccel_interface, THIS_MODULE); if (result) { - pr_err("fmh_gpib: gpib_register_driver failed: error =3D %d\n", result); + pr_err("gpib_register_driver failed: error =3D %d\n", result); goto err_unaccel; } =20 result =3D gpib_register_driver(&fmh_gpib_interface, THIS_MODULE); if (result) { - pr_err("fmh_gpib: gpib_register_driver failed: error =3D %d\n", result); + pr_err("gpib_register_driver failed: error =3D %d\n", result); goto err_interface; } =20 result =3D gpib_register_driver(&fmh_gpib_pci_unaccel_interface, THIS_MOD= ULE); if (result) { - pr_err("fmh_gpib: gpib_register_driver failed: error =3D %d\n", result); + pr_err("gpib_register_driver failed: error =3D %d\n", result); goto err_pci_unaccel; } =20 result =3D gpib_register_driver(&fmh_gpib_pci_interface, THIS_MODULE); if (result) { - pr_err("fmh_gpib: gpib_register_driver failed: error =3D %d\n", result); + pr_err("gpib_register_driver failed: error =3D %d\n", result); goto err_pci; } =20 --=20 2.48.1 From nobody Thu Mar 13 08:35:05 2025 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) (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 AAB71263C73 for ; Fri, 14 Feb 2025 11:47:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739533667; cv=none; b=qBLIoRczogikqENgDhmZFBao5iJ48kvJybH45FilSGDqq+CE7E1hpGYtmBQtDhpxs9nvt3ZKhy4omZ6PydrUjmu3dxASRVh5qiaJ6OV3uHi1KG75jxxghwiDdEzBtjj5h7eDyJKvOuiPfchJ9GWsSqFTXWoN+pMYvy7zTGY0VZ4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739533667; c=relaxed/simple; bh=tohAi5nBFkHj/tAgmQNpX3rhDfpyKrO/zJJ46ZJn49E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GwtUc4K8vHnXxTMKVO7PwVobw/hzXVjHVcpUJHKgOuX2Q/MtbY7LZ1e7qkrA0s2ZTAZqRbFAfgwUTqPyJROpp256J1RsC/xMI5wtBW1RZqb//z2W9JbaOvUDI9tLwKZ2JQGcu2gIVmkm6xokzOr81vNYthrJPO/YvRJ98nLh2qA= 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=EQcNNmQ9; arc=none smtp.client-ip=209.85.221.53 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="EQcNNmQ9" Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-38f2cb1ba55so518929f8f.3 for ; Fri, 14 Feb 2025 03:47:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739533663; x=1740138463; 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=ZTJq08jTmKdGfD1Y04JBtH26qiXRl5lyzw01SEJq/fg=; b=EQcNNmQ9WsSAtEJqi3UhgHKqo2zzziTevc5GUnpijZazxvdIydENyRDtTiMTJ6uYjx QOY4iQsoPMegAqnSaSLRvhNTwruV1ACLdgtczvtN7frhqTsTCTuE1ggO8/AcZZvV/Nri nc2egdVcFmGt4wu3kN0h/N0K+g4NeHKT/HWimDn8djo4eazHLQcMg2mx/7nzs8i2GYOK KCMBTeobzL9m+Sp6WYO1QVP/MjHPtHmEb9YWBGfG2dwRNkSWuVSz7IiXJykZLrRSUYLI 19aqRUyqpgGA01TEz7Tx+Ni8u41qpBi8GpH7P4JZwLdPojkSS6wYzVi5vAfMPDBzzhjE xXlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739533663; x=1740138463; 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=ZTJq08jTmKdGfD1Y04JBtH26qiXRl5lyzw01SEJq/fg=; b=RM10LsYNFmKjsB58P2DJDsuG3NRoW9H1654uU41Iznc0Zy8dd3b+fqu3KK8H4/6yzV imulSykWHQrqVi5kV6UtafHzSnLuiI9m3x2/JX6fWyRewMfHjoNFT2LW5DV40xEztc8E PA6RahmxlrcvFly1P69TJgGTMEIH7VbNr+keZrN+70r5tkhs6/A1sB++BYZanL9+0fqq QE1nExNr+dhIGaVueQ6wy6OkrHhgCX/fdTafkG9OOjH3oaozUGV6mdQYqcnm976/gEds CTgxP0IwYblKXROWCdqKiTRwplQNkC0KVhNlvC5Y8J0tvofUsobtiMz0byVzzkUjwk6H R6nw== X-Forwarded-Encrypted: i=1; AJvYcCWuqR+oLnri6E1rvyVLNjMlTgb5Ic4Au0VUPwJCWYFqtH2JgIjeaLeZBhwG/jT7tRysk8XK3FArdtWLB54=@vger.kernel.org X-Gm-Message-State: AOJu0YxBf9CDKDA7i4wXrnycwXZrkLH+FBteyQPqdoBSbIwLXs7Acfuc SoU2AL5O9g7Jvi3dz1BPGm4MUz1dqwaZ0J3CCk6Mp5FzpeCwusuzSCYXPw== X-Gm-Gg: ASbGncvRub0pTjxpzaph3WEeVr3X0RBemdSSOQ0qdPLyaGoBqc3CSts+S3GLZhoWOAR BFfheHIhmfTxXK8aAWhMEEJedEJxIRSswGNexZsksmXGBW5SJk9qOKV86jNm84LU2PnlpWx2NIA hosxpjLTTLvZ1HGiz1UOP4LQd4WsO1aJ61cjz1AWMvAUE/np2dq60TuT2G5Y5uDTGK11lx6NtSf kc4mOXlUwL5t1sGvBLh75sgwJQqkVmJDIvZ9UIEAFq/lUBj54tbQeCcLkoshptEXpc1bqRtOcCu PBlirK3UyNqD3Cv7U3DQfHvLvMc2oifGw5qRFozKCdzoZHHP9S4= X-Google-Smtp-Source: AGHT+IH3wicaWkeg29PW3y29BTX1IqB2mNLTjCCohqYxqTgqaedsp7JwXU3vPw0NBa0TmTQN+0R5ZA== X-Received: by 2002:a05:6000:18ab:b0:38f:276a:1662 with SMTP id ffacd0b85a97d-38f276a1705mr8044195f8f.13.1739533662814; Fri, 14 Feb 2025 03:47:42 -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.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Feb 2025 03:47:42 -0800 (PST) From: Dave Penkler To: gregkh@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Dave Penkler Subject: [PATCH 08/17] staging: gpib: gpio bitbang console messaging cleanup Date: Fri, 14 Feb 2025 12:46:59 +0100 Message-ID: <20250214114708.28947-9-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 Change pr_info in the dbg_printk macro to dev_dbg. In order for dbg_printk macro to have the board variable defined the signatures and calls to bb_buffer_print and set_atn were changed to include board as a parameter. Remove the #ifdef CONFIG_GPIB_DEBUG code. Remove commented dbk_printk's. Change dbg_printk(0, to dev_err where an error message is needed. Remove dbg_printk for "not implemented" functions. Remove "gpib_bitbang:" prefix in pr_err as it will be printed with the module name. Signed-off-by: Dave Penkler --- drivers/staging/gpib/gpio/gpib_bitbang.c | 56 ++++++++++-------------- 1 file changed, 23 insertions(+), 33 deletions(-) diff --git a/drivers/staging/gpib/gpio/gpib_bitbang.c b/drivers/staging/gpi= b/gpio/gpib_bitbang.c index 828c99ea613f..2012db188f58 100644 --- a/drivers/staging/gpib/gpio/gpib_bitbang.c +++ b/drivers/staging/gpib/gpio/gpib_bitbang.c @@ -25,6 +25,8 @@ * device support (non master operation) */ =20 +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#define dev_fmt pr_fmt #define NAME KBUILD_MODNAME =20 #define ENABLE_IRQ(IRQ, TYPE) irq_set_irq_type(IRQ, TYPE) @@ -41,7 +43,7 @@ */ #define dbg_printk(level, frm, ...) \ do { if (debug >=3D (level)) \ - pr_info("%s:%s - " frm, NAME, __func__, ## __VA_ARGS__); } \ + dev_dbg(board->gpib_dev, frm, ## __VA_ARGS__); } \ while (0) =20 #define LINVAL gpiod_get_value(DAV), \ @@ -316,13 +318,14 @@ struct bb_priv { }; =20 static inline long usec_diff(struct timespec64 *a, struct timespec64 *b); -static void bb_buffer_print(unsigned char *buffer, size_t length, int cmd,= int eoi); +static void bb_buffer_print(gpib_board_t *board, unsigned char *buffer, si= ze_t length, + int cmd, int eoi); static void set_data_lines(u8 byte); static u8 get_data_lines(void); static void set_data_lines_input(void); static void set_data_lines_output(void); static inline int check_for_eos(struct bb_priv *priv, uint8_t byte); -static void set_atn(struct bb_priv *priv, int atn_asserted); +static void set_atn(gpib_board_t *board, int atn_asserted); =20 static inline void SET_DIR_WRITE(struct bb_priv *priv); static inline void SET_DIR_READ(struct bb_priv *priv); @@ -334,11 +337,7 @@ MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("GPIB helper functions for bitbanging I/O"); =20 /**** global variables ****/ -#ifdef CONFIG_GPIB_DEBUG -static int debug =3D 1; -#else static int debug; -#endif module_param(debug, int, 0644); =20 static char printable(char x) @@ -508,7 +507,7 @@ static int bb_write(gpib_board_t *board, uint8_t *buffe= r, size_t length, board, mutex_is_locked(&board->user_mutex), length); =20 if (debug > 1) - bb_buffer_print(buffer, length, priv->cmd, send_eoi); + bb_buffer_print(board, buffer, length, priv->cmd, send_eoi); priv->count =3D 0; priv->phase =3D 300; =20 @@ -550,7 +549,6 @@ static int bb_write(gpib_board_t *board, uint8_t *buffe= r, size_t length, dbg_printk(1, "timeout after %zu/%zu at %d " LINFMT " eoi: %d\n", priv->w_cnt, length, priv->phase, LINVAL, send_eoi); } else { - // dbg_printk(1,"written %zu\n", priv->w_cnt); retval =3D priv->w_cnt; } } else { @@ -811,7 +809,8 @@ static char *cmd_string[32] =3D { "CFE" // 0x1f }; =20 -static void bb_buffer_print(unsigned char *buffer, size_t length, int cmd,= int eoi) +static void bb_buffer_print(gpib_board_t *board, unsigned char *buffer, si= ze_t length, + int cmd, int eoi) { int i; =20 @@ -843,11 +842,13 @@ static void bb_buffer_print(unsigned char *buffer, si= ze_t length, int cmd, int e * STATUS Management * * * *************************************************************************= **/ -static void set_atn(struct bb_priv *priv, int atn_asserted) +static void set_atn(gpib_board_t *board, int atn_asserted) { + struct bb_priv *priv =3D board->private_data; + if (priv->listener_state !=3D listener_idle && priv->talker_state !=3D talker_idle) { - dbg_printk(0, "listener/talker state machine conflict\n"); + dev_err(board->gpib_dev, "listener/talker state machine conflict\n"); } if (atn_asserted) { if (priv->listener_state =3D=3D listener_active) @@ -869,7 +870,7 @@ static void set_atn(struct bb_priv *priv, int atn_asser= ted) static int bb_take_control(gpib_board_t *board, int synchronous) { dbg_printk(2, "%d\n", synchronous); - set_atn(board->private_data, 1); + set_atn(board, 1); set_bit(CIC_NUM, &board->status); return 0; } @@ -877,7 +878,7 @@ static int bb_take_control(gpib_board_t *board, int syn= chronous) static int bb_go_to_standby(gpib_board_t *board) { dbg_printk(2, "\n"); - set_atn(board->private_data, 0); + set_atn(board, 0); return 0; } =20 @@ -988,13 +989,11 @@ static int bb_secondary_address(gpib_board_t *board, = unsigned int address, int e =20 static int bb_parallel_poll(gpib_board_t *board, uint8_t *result) { - dbg_printk(1, "%s\n", "not implemented"); - return -EPERM; + return -ENOENT; } =20 static void bb_parallel_poll_configure(gpib_board_t *board, uint8_t config) { - dbg_printk(1, "%s\n", "not implemented"); } =20 static void bb_parallel_poll_response(gpib_board_t *board, int ist) @@ -1003,13 +1002,11 @@ static void bb_parallel_poll_response(gpib_board_t = *board, int ist) =20 static void bb_serial_poll_response(gpib_board_t *board, uint8_t status) { - dbg_printk(1, "%s\n", "not implemented"); } =20 static uint8_t bb_serial_poll_status(gpib_board_t *board) { - dbg_printk(1, "%s\n", "not implemented"); - return 0; // -ENOSYS; + return 0; // -ENOENT; } =20 static unsigned int bb_t1_delay(gpib_board_t *board, unsigned int nano_se= c) @@ -1030,15 +1027,12 @@ static unsigned int bb_t1_delay(gpib_board_t *board= , unsigned int nano_sec) =20 static void bb_return_to_local(gpib_board_t *board) { - dbg_printk(1, "%s\n", "not implemented"); } =20 static int bb_line_status(const gpib_board_t *board) { int line_status =3D ValidALL; =20 -// dbg_printk(1,"\n"); - if (gpiod_get_value(REN) =3D=3D 0) line_status |=3D BusREN; if (gpiod_get_value(IFC) =3D=3D 0) @@ -1091,11 +1085,11 @@ static int bb_get_irq(gpib_board_t *board, char *na= me, *irq =3D gpiod_to_irq(gpio); dbg_printk(2, "IRQ %s: %d\n", name, *irq); if (*irq < 0) { - dbg_printk(0, "gpib: can't get IRQ for %s\n", name); + dev_err(board->gpib_dev, "can't get IRQ for %s\n", name); return -1; } if (request_threaded_irq(*irq, handler, thread_fn, flags, name, board)) { - dbg_printk(0, "gpib: can't request IRQ for %s %d\n", name, *irq); + dev_err(board->gpib_dev, "can't request IRQ for %s %d\n", name, *irq); *irq =3D 0; return -1; } @@ -1163,8 +1157,8 @@ static int allocate_gpios(gpib_board_t *board) gpiod_add_lookup_table(lookup_table); goto try_again; } - dbg_printk(0, "Unable to obtain gpio descriptor for pin %d error %ld\n", - gpios_vector[j], PTR_ERR(desc)); + dev_err(board->gpib_dev, "Unable to obtain gpio descriptor for pin %d e= rror %ld\n", + gpios_vector[j], PTR_ERR(desc)); error =3D true; break; } @@ -1253,7 +1247,7 @@ static int bb_attach(gpib_board_t *board, const gpib_= board_config_t *config) gpios_vector[&(DC) - &all_descriptors[0]] =3D -1; gpios_vector[&(ACT_LED) - &all_descriptors[0]] =3D -1; } else { - dbg_printk(0, "Unrecognized pin mapping.\n"); + dev_err(board->gpib_dev, "Unrecognized pin map %s\n", pin_map); goto bb_attach_fail; } dbg_printk(0, "Using pin map \"%s\" %s\n", pin_map, (sn7516x) ? @@ -1344,19 +1338,15 @@ static int __init bb_init_module(void) int result =3D gpib_register_driver(&bb_interface, THIS_MODULE); =20 if (result) { - pr_err("gpib_bitbang: gpib_register_driver failed: error =3D %d\n", resu= lt); + pr_err("gpib_register_driver failed: error =3D %d\n", result); return result; } =20 - dbg_printk(0, "module loaded with pin map \"%s\"%s\n", - pin_map, (sn7516x_used) ? " and SN7516x driver support" : ""); return 0; } =20 static void __exit bb_exit_module(void) { - dbg_printk(0, "module unloaded!"); - gpib_unregister_driver(&bb_interface); } =20 --=20 2.48.1 From nobody Thu Mar 13 08:35:05 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 F2A3A264613 for ; Fri, 14 Feb 2025 11:47:45 +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=1739533668; cv=none; b=MTXtssYjGJl1wliM73DMIYAAMJ11E0nwmqGINalNnpHluVEJQBTjQG7ACpZ57LyBFcAOUg5d3oDq7uaYmV7iR21DCOhTKBZmWm1+9bfhrM+SSmdQRxlPbpnhgAyXJiNX9RQcNY87hHCcTdq99JuxwfrEw6kZe1CzJyS2qlKj3v0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739533668; c=relaxed/simple; bh=otW1RJyE4F3ikNxsbuQW9V3/snb/w7z5xN/QWk8BC4U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sEBRAQiobroWr2qkPBOI62SXHQlDZqEOTUemMI953EoOUQ37lB47gPeyUCr20zfiy9nRzSryeGqy5gxxeSLdzrc8+VmJIWGDOMBJUomSCiQ1vF9FlL5NVNa61B7JiCkncup0QxIISKlzyYX9ZfGlZ4AfnFF5DGfl/rCCbOxprNs= 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=ALXmw46E; 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="ALXmw46E" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-43965592e1bso14224755e9.2 for ; Fri, 14 Feb 2025 03:47:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739533664; x=1740138464; 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=LVmtBhEiVyNl8QZ1O6tERZVz1PTbfN4nkq7rh5ldJZo=; b=ALXmw46EAmdDbux+gnQvxdAAItaHAzpiPRcORketR/4OIkPYUhxVfroUulD030GxfS exyLzHT2YJOCwfUoTFAc6hnmAIXMg6WoKOAmPzBhjp0OXe86P432VzP4xXUbKjmQ3LgI 36aTLj6R9femqQHQ/z4zUaQdBquJrVGcMHP4t4kgqJ5t4we/1Ycw0N+dvrA9KKrLYGGb bfLiu3+7/8WZdm++KekJb5i//BtrcnaUXCrpd0UwUoVnp97gRMHefZ52scdXYIcNGupD zq/7Tz+PZXtSHOPUIePcIo21Lt0B4iy4VE9yDb7O+/Abk/g6hj90CaWO0gSWkE+MD37q /JUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739533664; x=1740138464; 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=LVmtBhEiVyNl8QZ1O6tERZVz1PTbfN4nkq7rh5ldJZo=; b=L+1+mudHBSKhBimMDHTULkrziURzOOjLMcI1YIhYXM35lAk88y5ACm8RbsrQStr3pR krH1919XvOyXxzppbscSVb2NhTSO0JpA4j+VdDZtZgUz2m3WWXjSDuFUTZ36CXMWaE/b wh2mbXIogg/u/eEss/G2SEkmkjQkvSXL7RuaMd6XA6SeN4mPTqmS+IUT2D+6bmsjbXwn iZwQTPdx6kHGtMHfKnQz+BIIzUrhSxJeWZvo7AyzyG6X9ElkL+bJLfAlz74grmm6RmQQ +rWpTkVZATICElmTVK9gWWKGDgt+zna6KLbScLr6xhnASs+4eFj9VuaJF0yE3pVz46Vk ewHA== X-Forwarded-Encrypted: i=1; AJvYcCVRxEA3qOXo8I6TTTeRcUxYg4A4gilt3MbsjHvhtnqg82lfw1LWysSlClEBo9dhSKgeyRGJemVppVdensI=@vger.kernel.org X-Gm-Message-State: AOJu0Yx/kZaWjxYSnIjA72gP5ieWLrYtfN4G0gE5bIvdRAJRMbdy1s5F AZQGhHxoTiEN+wUUsDrj0lTZHRixDXVYRxBqVnhJJATLMWxGXa49 X-Gm-Gg: ASbGnct08cZOHT9geGbhmhM5zF6sd6QLjvZvqKAVAyyhgn1T1UvReQcCG9X9wQo1c7F DnNKAe4au/uhY9IJSHf83UYLumLkP2sud6sVMyQLnYhjqapvtdMhFuN+eLIHmm4ztkI6hZNdILN omEE/4/yVuWCYdVjXtlzdfIANyUPl3vVN/BzG3onlB+bl4AZodsPL/6CORoNuMoTvp+bPv2vkWO DsmUF9dfDQE4a9axcfBWpQSufihDGrHRb/+ofd87WIGuZvbrpqAPCbRtRvA0uY0OIP/LSPILqwF fNyOjV/u5LqGcboVGHIKbFL8NItu0lnwTbjnKVbqF9odNt0NBi4= X-Google-Smtp-Source: AGHT+IHJe9C5L7fJm3g1s0tX91oj/gwWsIwn+t9Y/6w2fpyFGBvil/NIo8HpbEWwojtJCTK1tz+sJQ== X-Received: by 2002:a05:600c:c14:b0:439:63cb:ff7e with SMTP id 5b1f17b1804b1-43963cc00d4mr82079965e9.10.1739533664177; Fri, 14 Feb 2025 03:47:44 -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.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Feb 2025 03:47:43 -0800 (PST) From: Dave Penkler To: gregkh@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Dave Penkler Subject: [PATCH 09/17] staging: gpib: hp82335 console messaging cleanup Date: Fri, 14 Feb 2025 12:47:00 +0100 Message-ID: <20250214114708.28947-10-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 "hp82335" in request_irq Change pr_err to dev_err wherever possible Remove pr_info's Remove "hp83335:" prefix in messages since this is printed with the module name. Signed-off-by: Dave Penkler --- drivers/staging/gpib/hp_82335/hp82335.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/staging/gpib/hp_82335/hp82335.c b/drivers/staging/gpib= /hp_82335/hp82335.c index 451d5dc6d340..982544d1b382 100644 --- a/drivers/staging/gpib/hp_82335/hp82335.c +++ b/drivers/staging/gpib/hp_82335/hp82335.c @@ -8,6 +8,10 @@ * implement recovery from bus errors (if necessary) */ =20 +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#define dev_fmt pr_fmt +#define DRV_NAME KBUILD_MODNAME + #include "hp82335.h" #include #include @@ -274,26 +278,23 @@ static int hp82335_attach(gpib_board_t *board, const = gpib_board_config_t *config case 0xfc000: break; default: - pr_err("hp82335: invalid base io address 0x%u\n", config->ibbase); + dev_err(board->gpib_dev, "invalid base io address 0x%x\n", config->ibbas= e); return -EINVAL; } if (!request_mem_region(upper_iomem_base, hp82335_upper_iomem_size, "hp82= 335")) { - pr_err("hp82335: failed to allocate io memory region 0x%lx-0x%lx\n", - upper_iomem_base, upper_iomem_base + hp82335_upper_iomem_size - 1= ); + dev_err(board->gpib_dev, "failed to allocate io memory region 0x%lx-0x%l= x\n", + upper_iomem_base, upper_iomem_base + hp82335_upper_iomem_size - 1); return -EBUSY; } hp_priv->raw_iobase =3D upper_iomem_base; tms_priv->mmiobase =3D ioremap(upper_iomem_base, hp82335_upper_iomem_size= ); - pr_info("hp82335: upper half of 82335 iomem region 0x%lx remapped to 0x%p= \n", - hp_priv->raw_iobase, tms_priv->mmiobase); =20 - retval =3D request_irq(config->ibirq, hp82335_interrupt, 0, "hp82335", bo= ard); + retval =3D request_irq(config->ibirq, hp82335_interrupt, 0, DRV_NAME, boa= rd); if (retval) { - pr_err("hp82335: can't request IRQ %d\n", config->ibirq); + dev_err(board->gpib_dev, "can't request IRQ %d\n", config->ibirq); return retval; } hp_priv->irq =3D config->ibirq; - pr_info("hp82335: IRQ %d\n", config->ibirq); =20 tms9914_board_reset(tms_priv); =20 @@ -331,7 +332,7 @@ static int __init hp82335_init_module(void) int result =3D gpib_register_driver(&hp82335_interface, THIS_MODULE); =20 if (result) { - pr_err("hp82335: gpib_register_driver failed: error =3D %d\n", result); + pr_err("gpib_register_driver failed: error =3D %d\n", result); return result; } =20 --=20 2.48.1 From nobody Thu Mar 13 08:35:05 2025 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (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 6C8FD264A84 for ; Fri, 14 Feb 2025 11:47:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739533671; cv=none; b=aRnCFEh8op00ZZsESDXinr18P+tgEqB6qJ+eOhjyln8MwKeUNd1iAaw4+/cJr+oS1jmskkY/vmHjDOOsSkMPfe4HZYfATj0idPUj86jDwadtWVvg/Yshebt2gyKJdfdFZUSm5K/ypdLHCYER3zgMMU5rp6x+tjXO3q8+2WpjZJQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739533671; c=relaxed/simple; bh=ijyH4DVGB8FNQ0gY42wKtBKYVu7WhC3PPIBdhg4FeIo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ML7/XxQrbTFnwpu66BJHv8zRzf15If/lr58EYs44gwy+T5LeFtIi1ojUhupGq05hwwRKADaDEu1RI5sRnAyNU2//A+ObB8SZ5wQOO+AZVBKLl4lUlhNbKLVdzIUijf2gy41rSUVQmMwqa5u/5+yPgVa0XQ03tc7okK4HiOMhPCw= 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=mEPJm+Xe; arc=none smtp.client-ip=209.85.128.45 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="mEPJm+Xe" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-4396a24118dso3713555e9.0 for ; Fri, 14 Feb 2025 03:47:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739533667; x=1740138467; 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=qgvV/67S4yU4G2qIKWOT0FF3EvbLiZzOC/0UnfzPRlU=; b=mEPJm+XeTzp9zroZbiJSoblexbvQKF2x1A69uoe1TEgKikQs2P6h+SLXdIQs+QhIWH 6lWwq3axUJdnkbSXutz0TfEpXFHPVmctB75n+yBK78f/Bx+ndpeQ1WQPgMfqlXltla7x Ov2xJJLgM1/sv5HmifcV0rsx018iOphCX+CrQXKSsPkXrR5A4jBcSmN4f6VshfZPc7uw J/Wyw+s+YzXZOrDHEMB7vRA2RzJBSALPFbKuBQHnaERmVNnQWBK8EbTog4HVxkjgGbXZ UygOmdSDCONzNxJPsx+Jvb/FEFleExzIiZDmb+aQIyBOO6wn5N+BxJ2exRo357tnyr5Y oYaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739533667; x=1740138467; 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=qgvV/67S4yU4G2qIKWOT0FF3EvbLiZzOC/0UnfzPRlU=; b=DtPIagdCwwhD+P5YZjVH7DcQQVlV5k2oYKPrcNEyk9ayJKC1BIsC5Q6plV1l742YkM xftZ0l7zuuaIyD/QnyyyNQQSxh+5Lk4XBDe47pp28T13f2Sg8eWX4ClkT/csgcl+kUhE zPXfo3dHgGftU8gX5dSy0sH9ugynuqHRBFU3kXlvim6Y2JudaiP6tacZDB3IlpQfG8fC 48AWMh3k28IGU7ILWLAEKO2GCoeQ9ArBVlpWmSqCPYYxGle+mgSHMnweIpSggYfUnv2o 0iwhV3ubjhuEbjDcEhqtzQ1tpZEl6HtuLumhEMBk4DwVH3rnkb7rUppqpf5YkIsGie4r KB9Q== X-Forwarded-Encrypted: i=1; AJvYcCU8GG8capcHd8TGfxMN7eoH8xyB+RXFMFR5qQCfrG8mElW3XHZYYEFCXhG13/JFizFX/zCjs7Bu4tGfs+I=@vger.kernel.org X-Gm-Message-State: AOJu0YysNkNPlCb2fwHaFiGzF9Hes1rUdJpYQ+XogIpsBrNjjDfdM7/b iYEX9/w5qfG9A/XWpq4WcdNx0olayAxg3Ed9KcpbTtWoOs+pCnUn X-Gm-Gg: ASbGncsoQY+/AIfEqwFr5JZrgAoNUSHCuncslefDYk9GLy5ai5KchLyz03GkZ9IjRZZ +nrysczrxHIobO419NoHYPbrWCV2uk0bHFf/Bb7ou2enKGs6s8LHtipf6eLM/3FAPO0jWgh7bhZ TMstboIkYoHEyMFK/TCNlJWW6s4aT4TRIIrKeQGkDA+fHezA9Fp3IgEdo/uoE7BCvk98gftMHwr v96X5NrydxuNUpP/4ndspjugOWR4PzyYu/sdNbm3Xw2RJBEa/9xOG1ImviUNNgCGTL8Rsdt9Wc2 fdIisCLmWuCcKPekFO+dk8Z44G36z3ipXBlJPqeGVCNdK7bjrI4= X-Google-Smtp-Source: AGHT+IEHR4rOwR3AojbDga7TpmFjdPf9C2oBcw7THoky/+/GclhGxBbaPuDFPPXE01+4RGtdv/O2Cw== X-Received: by 2002:a05:600c:4e4f:b0:439:6304:e28a with SMTP id 5b1f17b1804b1-4396304e556mr90090845e9.0.1739533666396; Fri, 14 Feb 2025 03:47:46 -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.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Feb 2025 03:47:44 -0800 (PST) From: Dave Penkler To: gregkh@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Dave Penkler Subject: [PATCH 10/17] staging: gpib: hp82341 console messaging cleanup Date: Fri, 14 Feb 2025 12:47:01 +0100 Message-ID: <20250214114708.28947-11-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 "hp82341" in request_region and request_irq Change pr_err to dev_err wherever possible Remove pr_warn and pr_debug for timed out or interrupted reads and writes. Remove "hp_82341:" prefix in messages since this is printed with the module name. Remove __func__ parameter in pr_err. Remove pr_info's. Remove cpmmented printk's. Signed-off-by: Dave Penkler --- drivers/staging/gpib/hp_82341/hp_82341.c | 70 ++++++++++-------------- 1 file changed, 30 insertions(+), 40 deletions(-) diff --git a/drivers/staging/gpib/hp_82341/hp_82341.c b/drivers/staging/gpi= b/hp_82341/hp_82341.c index 800f99c05566..3ac87d1a1fab 100644 --- a/drivers/staging/gpib/hp_82341/hp_82341.c +++ b/drivers/staging/gpib/hp_82341/hp_82341.c @@ -6,6 +6,10 @@ * copyright : (C) 2002, 2005 by Frank Mori Hess = * *************************************************************************= **/ =20 +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#define dev_fmt pr_fmt +#define DRV_NAME KBUILD_MODNAME + #include "hp_82341.h" #include #include @@ -57,7 +61,7 @@ static int hp_82341_accel_read(gpib_board_t *board, uint8= _t *buffer, size_t leng retval =3D tms9914_read(board, tms_priv, buffer, 1, end, &num_bytes); *bytes_read +=3D num_bytes; if (retval < 0) - pr_err("tms9914_read failed retval=3D%i\n", retval); + dev_err(board->gpib_dev, "tms9914_read failed retval=3D%i\n", retval); if (retval < 0 || *end) return retval; ++buffer; @@ -93,7 +97,6 @@ static int hp_82341_accel_read(gpib_board_t *board, uint8= _t *buffer, size_t leng test_bit(DEV_CLEAR_BN, &tms_priv->state) || test_bit(TIMO_NUM, &board->status)); if (retval) { - pr_warn("%s: read wait interrupted\n", __func__); retval =3D -ERESTARTSYS; break; } @@ -118,12 +121,10 @@ static int hp_82341_accel_read(gpib_board_t *board, u= int8_t *buffer, size_t leng tms_priv->holdoff_active =3D 1; } if (test_bit(TIMO_NUM, &board->status)) { - pr_debug("%s: minor %i: read timed out\n", __FILE__, board->minor); retval =3D -ETIMEDOUT; break; } if (test_bit(DEV_CLEAR_BN, &tms_priv->state)) { - pr_warn("%s: device clear interrupted read\n", __FILE__); retval =3D -EINTR; break; } @@ -211,7 +212,7 @@ static int hp_82341_accel_write(gpib_board_t *board, ui= nt8_t *buffer, size_t len outb(ENABLE_TI_BUFFER_BIT, hp_priv->iobase[3] + BUFFER_CONTROL_REG); retval =3D restart_write_fifo(board, hp_priv); if (retval < 0) { - pr_err("hp82341: failed to restart write stream\n"); + dev_err(board->gpib_dev, "failed to restart write stream\n"); break; } retval =3D wait_event_interruptible(board->wait, @@ -223,17 +224,14 @@ static int hp_82341_accel_write(gpib_board_t *board, = uint8_t *buffer, size_t len outb(0, hp_priv->iobase[3] + BUFFER_CONTROL_REG); *bytes_written +=3D block_size - read_transfer_counter(hp_priv); if (retval) { - pr_warn("%s: write wait interrupted\n", __FILE__); retval =3D -ERESTARTSYS; break; } if (test_bit(TIMO_NUM, &board->status)) { - pr_debug("%s: minor %i: write timed out\n", __FILE__, board->minor); retval =3D -ETIMEDOUT; break; } if (test_bit(DEV_CLEAR_BN, &tms_priv->state)) { - pr_warn("%s: device clear interrupted write\n", __FILE__); retval =3D -EINTR; break; } @@ -495,21 +493,21 @@ static int hp_82341_find_isapnp_board(struct pnp_dev = **dev) *dev =3D pnp_find_dev(NULL, ISAPNP_VENDOR('H', 'W', 'P'), ISAPNP_FUNCTION(0x1411), NULL); if (!*dev || !(*dev)->card) { - pr_err("hp_82341: failed to find isapnp board\n"); + pr_err("failed to find isapnp board\n"); return -ENODEV; } if (pnp_device_attach(*dev) < 0) { - pr_err("hp_82341: board already active, skipping\n"); + pr_err("board already active, skipping\n"); return -EBUSY; } if (pnp_activate_dev(*dev) < 0) { pnp_device_detach(*dev); - pr_err("hp_82341: failed to activate() atgpib/tnt, aborting\n"); + pr_err("failed to activate(), aborting\n"); return -EAGAIN; } if (!pnp_port_valid(*dev, 0) || !pnp_irq_valid(*dev, 0)) { pnp_device_detach(*dev); - pr_err("hp_82341: invalid port or irq for atgpib/tnt, aborting\n"); + pr_err("invalid port or irq, aborting\n"); return -ENOMEM; } return 0; @@ -530,7 +528,7 @@ static int xilinx_ready(struct hp_82341_priv *hp_priv) else return 0; default: - pr_err("hp_82341: %s: bug! unknown hw_version\n", __func__); + pr_err("bug! unknown hw_version\n"); break; } return 0; @@ -550,7 +548,7 @@ static int xilinx_done(struct hp_82341_priv *hp_priv) else return 0; default: - pr_err("hp_82341: %s: bug! unknown hw_version\n", __func__); + pr_err("bug! unknown hw_version\n"); break; } return 0; @@ -571,7 +569,7 @@ static int irq_valid(struct hp_82341_priv *hp_priv, int= irq) case 15: return 1; default: - pr_err("hp_82341: invalid irq=3D%i for 82341C, irq must be 3, 5, 7, 9, = 10, 11, 12, or 15.\n", + pr_err("invalid irq=3D%i for 82341C, irq must be 3, 5, 7, 9, 10, 11, 12= , or 15.\n", irq); return 0; } @@ -579,7 +577,7 @@ static int irq_valid(struct hp_82341_priv *hp_priv, int= irq) case HW_VERSION_82341D: return 1; default: - pr_err("hp_82341: %s: bug! unknown hw_version\n", __func__); + pr_err("bug! unknown hw_version\n"); break; } return 0; @@ -601,7 +599,7 @@ static int hp_82341_load_firmware_array(struct hp_82341= _priv *hp_priv, usleep_range(10, 15); } if (j =3D=3D timeout) { - pr_err("hp_82341: timed out waiting for Xilinx ready.\n"); + pr_err("timed out waiting for Xilinx ready.\n"); return -ETIMEDOUT; } outb(firmware_data[i], hp_priv->iobase[0] + XILINX_DATA_REG); @@ -614,7 +612,7 @@ static int hp_82341_load_firmware_array(struct hp_82341= _priv *hp_priv, usleep_range(10, 15); } if (j =3D=3D timeout) { - pr_err("hp_82341: timed out waiting for Xilinx done.\n"); + pr_err("timed out waiting for Xilinx done.\n"); return -ETIMEDOUT; } return 0; @@ -625,27 +623,27 @@ static int hp_82341_load_firmware(struct hp_82341_pri= v *hp_priv, const gpib_boar if (config->init_data_length =3D=3D 0) { if (xilinx_done(hp_priv)) return 0; - pr_err("hp_82341: board needs be initialized with firmware upload.\n" + pr_err("board needs be initialized with firmware upload.\n" "\tUse the --init-data option of gpib_config.\n"); return -EINVAL; } switch (hp_priv->hw_version) { case HW_VERSION_82341C: if (config->init_data_length !=3D hp_82341c_firmware_length) { - pr_err("hp_82341: bad firmware length=3D%i for 82341c (expected %i).\n", + pr_err("bad firmware length=3D%i for 82341c (expected %i).\n", config->init_data_length, hp_82341c_firmware_length); return -EINVAL; } break; case HW_VERSION_82341D: if (config->init_data_length !=3D hp_82341d_firmware_length) { - pr_err("hp_82341: bad firmware length=3D%i for 82341d (expected %i).\n", + pr_err("bad firmware length=3D%i for 82341d (expected %i).\n", config->init_data_length, hp_82341d_firmware_length); return -EINVAL; } break; default: - pr_err("hp_82341: %s: bug! unknown hw_version\n", __func__); + pr_err("bug! unknown hw_version\n"); break; } return hp_82341_load_firmware_array(hp_priv, config->init_data, config->i= nit_data_length); @@ -723,13 +721,12 @@ static int hp_82341_attach(gpib_board_t *board, const= gpib_board_config_t *confi hp_priv->hw_version =3D HW_VERSION_82341C; hp_priv->io_region_offset =3D 0x400; } - pr_info("hp_82341: base io 0x%u\n", iobase); for (i =3D 0; i < hp_82341_num_io_regions; ++i) { start_addr =3D iobase + i * hp_priv->io_region_offset; - if (!request_region(start_addr, hp_82341_region_iosize, "hp_82341")) { - pr_err("hp_82341: failed to allocate io ports 0x%x-0x%x\n", - start_addr, - start_addr + hp_82341_region_iosize - 1); + if (!request_region(start_addr, hp_82341_region_iosize, DRV_NAME)) { + dev_err(board->gpib_dev, "failed to allocate io ports 0x%x-0x%x\n", + start_addr, + start_addr + hp_82341_region_iosize - 1); return -EIO; } hp_priv->iobase[i] =3D start_addr; @@ -739,7 +736,7 @@ static int hp_82341_attach(gpib_board_t *board, const g= pib_board_config_t *confi retval =3D isapnp_cfg_begin(hp_priv->pnp_dev->card->number, hp_priv->pnp_dev->number); if (retval < 0) { - pr_err("hp_82341: isapnp_cfg_begin returned error\n"); + dev_err(board->gpib_dev, "isapnp_cfg_begin returned error\n"); return retval; } isapnp_write_byte(PIO_DIRECTION_REG, HP_82341D_XILINX_READY_BIT | @@ -755,12 +752,11 @@ static int hp_82341_attach(gpib_board_t *board, const= gpib_board_config_t *confi return retval; if (irq_valid(hp_priv, irq) =3D=3D 0) return -EINVAL; - if (request_irq(irq, hp_82341_interrupt, 0, "hp_82341", board)) { - pr_err("hp_82341: failed to allocate IRQ %d\n", irq); + if (request_irq(irq, hp_82341_interrupt, 0, DRV_NAME, board)) { + dev_err(board->gpib_dev, "failed to allocate IRQ %d\n", irq); return -EIO; } hp_priv->irq =3D irq; - pr_info("hp_82341: IRQ %d\n", irq); hp_priv->config_control_bits &=3D ~IRQ_SELECT_MASK; hp_priv->config_control_bits |=3D IRQ_SELECT_BITS(irq); outb(hp_priv->config_control_bits, hp_priv->iobase[0] + CONFIG_CONTROL_ST= ATUS_REG); @@ -777,9 +773,7 @@ static int hp_82341_attach(gpib_board_t *board, const g= pib_board_config_t *confi hp_priv->iobase[0] + EVENT_STATUS_REG); =20 tms9914_online(board, tms_priv); - pr_info("hp_82341: board id %x %x %x %x\n", inb(hp_priv->iobase[1] + ID0_= REG), - inb(hp_priv->iobase[1] + ID1_REG), inb(hp_priv->iobase[2] + ID2_REG), - inb(hp_priv->iobase[2] + ID3_REG)); + return 0; } =20 @@ -820,13 +814,13 @@ static int __init hp_82341_init_module(void) =20 ret =3D gpib_register_driver(&hp_82341_unaccel_interface, THIS_MODULE); if (ret) { - pr_err("hp_82341: gpib_register_driver failed: error =3D %d\n", ret); + pr_err("gpib_register_driver failed: error =3D %d\n", ret); return ret; } =20 ret =3D gpib_register_driver(&hp_82341_interface, THIS_MODULE); if (ret) { - pr_err("hp_82341: gpib_register_driver failed: error =3D %d\n", ret); + pr_err("gpib_register_driver failed: error =3D %d\n", ret); gpib_unregister_driver(&hp_82341_unaccel_interface); return ret; } @@ -871,7 +865,6 @@ static irqreturn_t hp_82341_interrupt(int irq, void *ar= g) =20 spin_lock_irqsave(&board->spinlock, flags); event_status =3D inb(hp_priv->iobase[0] + EVENT_STATUS_REG); -// printk("hp_82341: interrupt event_status=3D0x%x\n", event_status); if (event_status & INTERRUPT_PENDING_EVENT_BIT) retval =3D IRQ_HANDLED; //write-clear status bits @@ -886,9 +879,6 @@ static irqreturn_t hp_82341_interrupt(int irq, void *ar= g) status1 =3D read_byte(tms_priv, ISR0); status2 =3D read_byte(tms_priv, ISR1); tms9914_interrupt_have_status(board, tms_priv, status1, status2); -/* printk("hp_82341: interrupt status1=3D0x%x status2=3D0x%x\n", - * status1, status2); - */ } spin_unlock_irqrestore(&board->spinlock, flags); return retval; --=20 2.48.1 From nobody Thu Mar 13 08:35:05 2025 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (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 B7049264A9E for ; Fri, 14 Feb 2025 11:47:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739533672; cv=none; b=u13pLPr+GA1JiUKKCc/zzhSDOJgJL0XoCVMBS+g6KXFfRW3zSfFzaf0U53QCwYJpB2fhOSK7c5IrvLuRHClDmUTemEqJzgnEMg3PNOZOahglIbjbkNeGX+lmUuwH7h+er+zIfcxP4plGUKaeVfgjcnlUqnjfC4jfFS9v2ST//+0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739533672; c=relaxed/simple; bh=O1bn/1BvZjgyqpcx895AnBWA2zAgV1uG/BJY6OxiQxM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ttxj1nAp//lPsADs2u8WTNLOjY9b7kSY6uvr+lvMeOGhWSefRTU3kvuI67Y8JJXhnWnxqGBKdsaPFhNpIX/r/uVGvQGiLYZGEd48EgYQIlU07IuThgmLXeAHuvxLJVUQ6VgnSeYlRlCnzPHY9u8ANsBOcN98+l8ZskInuFm347Q= 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=XUt/RxNE; arc=none smtp.client-ip=209.85.128.45 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="XUt/RxNE" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-43964e79314so13995045e9.3 for ; Fri, 14 Feb 2025 03:47:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739533668; x=1740138468; 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=0OV+mCEvNJudQflI2QhDp7yyUUWwi2LGNvBg4pxJAkQ=; b=XUt/RxNE00a/g7RW46TyULDjnZex+JDurs5sq8yigntouNPtFdADrPuYtT2t3KHCVO KcU8dqa6Qi6liQcx2Exr4T23Duu7XdH/wGZHQ7hOS2E0m39mQbgkRlq4O0+BmbBEQ5DD arxrUtpPNzQ1iPkBMQ4dPdNJt+bXSHOqB7OSxPo8FDxwUEkwPm1Jx5+LYJC5Uim2zIfo UIHVurASuJu2BIXOFJge/jvkcngI7esRrnjYFYzKd+CjOCNIOMG1AYF8oL4l2UZj+QDC /N6CbrbSXZ75R4Jbu8f/VQYR6LJr2S9Sa6gAqEaQbEoBcgkuAcZXDkm0uDvc93/whgaG CdZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739533668; x=1740138468; 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=0OV+mCEvNJudQflI2QhDp7yyUUWwi2LGNvBg4pxJAkQ=; b=AVZpayM5A3x/aW1CDt/vA/jMg4sD4vYGT/v4+hc5ncnUUceAQjFhP8tI3+nq8hCepX uT+ggbL7m01x2Xy/jd+nVTGvVyYkZJbI1ybyJVxUJw1lXkwE7bF+IPmuK16VR1InObgJ +qsKRERu4Brmo0Nm/w+IkfsEfUvL9oixfjaqX93k6jgWL7SeAmRApUXLe+HQabgS3PtB gaiMcnq75PfruaHjETSivT4ieZdLCxXI/eFaDaLOZ1XaY182JJYYzr4Reh8i/lGuDsUc BA/hRgg3kWyWKEyGTCoWUOqxb2uSDl9KGVRnYWB5DO31UxdAzz2YbrYftShQ/g17QHSB KHHw== X-Forwarded-Encrypted: i=1; AJvYcCWLb5J9zYGJ7xi2ohsnkWzInO05tNlEgoM3cto3nrb0N/TxFBp+omdxid+c4H/EfNJEp8cMxCF1wXCpOi0=@vger.kernel.org X-Gm-Message-State: AOJu0YyDS0Ilm67X/TF2yqSVGC/8E9820lN9SD3P1mXk7wBn5lQykrK9 +2KwAcSoKlTIG4dS5Q30neYtAf/SqOAfSEw9RVLXD4nhGwmojuiA8FZmPA== X-Gm-Gg: ASbGncsR6kC2hbGqKXl+GnAeEKlGMC+KOHinYUHMVL1GfExNotkzv9DvANddaOnNbtp 5oTfUFVUfixtaf1BSrvJxa5muM+deUHy99Bhx91XNvxffFbCAhU7O8eQwdX0tZRlb5bQkxf7H9a 2j/HPtT2MxTlYP1tDzCRjdJFsmi7OuNn5svXdZn41H8SBrHb4FzOS7mM0YpO8iLLFMsVl6o8HKk ivcX3HWgvQMOR4aB1AznS6A29sB6qOgitCVdhBrlU2eU0bhM40M4sOwnLZ0YeCmryWnX0Ief2CB u9vF7ubP3QKWwB+fYEP/uVDngc4+tycFNix8rIGWjlMmkEFoA6U= X-Google-Smtp-Source: AGHT+IEdZouX4H3Wr2448+BGz52nT6alNmtKfh/sTN9TTpAKLYm7MbbGwFi6Lur6dFYNbUrO0WMNBQ== X-Received: by 2002:a05:600c:4fd1:b0:439:35d2:ed6 with SMTP id 5b1f17b1804b1-4395816077amr120572785e9.3.1739533667779; Fri, 14 Feb 2025 03:47:47 -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.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Feb 2025 03:47:46 -0800 (PST) From: Dave Penkler To: gregkh@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Dave Penkler Subject: [PATCH 11/17] staging: gpib: ines console messaging cleanup Date: Fri, 14 Feb 2025 12:47:02 +0100 Message-ID: <20250214114708.28947-12-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 "ines_gpib" in pci_request_regions, request_irq and request_region. Remove "ines:" and "ines_gpib:" string prefixes in messages since module name printing is enabled. Change pr_err to dev_err where possible. Remove interrupt warnings. Remove PCMCIA debug comments, PCMCIA_DEBUG conditional compilation symbol, the DEBUG macro definition and its uses. Change pr_debug to dev_dbg. Remove pr_info Remove commented printk. Signed-off-by: Dave Penkler --- drivers/staging/gpib/ines/ines_gpib.c | 101 +++++++++++--------------- 1 file changed, 42 insertions(+), 59 deletions(-) diff --git a/drivers/staging/gpib/ines/ines_gpib.c b/drivers/staging/gpib/i= nes/ines_gpib.c index 73dafbe68acb..0f70438513df 100644 --- a/drivers/staging/gpib/ines/ines_gpib.c +++ b/drivers/staging/gpib/ines/ines_gpib.c @@ -5,6 +5,10 @@ * (C) 2002 by Frank Mori Hess *************************************************************************= **/ =20 +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#define dev_fmt pr_fmt +#define DRV_NAME KBUILD_MODNAME + #include "ines.h" =20 #include @@ -56,7 +60,7 @@ int ines_line_status(const gpib_board_t *board) void ines_set_xfer_counter(struct ines_priv *priv, unsigned int count) { if (count > 0xffff) { - pr_err("ines: bug! tried to set xfer counter > 0xffff\n"); + pr_err("bug! tried to set xfer counter > 0xffff\n"); return; } ines_outb(priv, (count >> 8) & 0xff, XFER_COUNT_UPPER); @@ -106,21 +110,18 @@ static ssize_t pio_read(gpib_board_t *board, struct i= nes_priv *ines_priv, uint8_ num_in_fifo_bytes(ines_priv) || test_bit(RECEIVED_END_BN, &nec_priv->state) || test_bit(DEV_CLEAR_BN, &nec_priv->state) || - test_bit(TIMO_NUM, &board->status))) { - pr_warn("gpib: pio read wait interrupted\n"); + test_bit(TIMO_NUM, &board->status))) return -ERESTARTSYS; - } + if (test_bit(TIMO_NUM, &board->status)) return -ETIMEDOUT; if (test_bit(DEV_CLEAR_BN, &nec_priv->state)) return -EINTR; =20 num_fifo_bytes =3D num_in_fifo_bytes(ines_priv); - if (num_fifo_bytes + *nbytes > length) { - pr_warn("ines: counter allowed %li extra byte(s)\n", - (long)(num_fifo_bytes - (length - *nbytes))); + if (num_fifo_bytes + *nbytes > length) num_fifo_bytes =3D length - *nbytes; - } + for (i =3D 0; i < num_fifo_bytes; i++) buffer[(*nbytes)++] =3D read_byte(nec_priv, DIR); if (test_bit(RECEIVED_END_BN, &nec_priv->state) && @@ -201,10 +202,9 @@ static int ines_write_wait(gpib_board_t *board, struct= ines_priv *ines_priv, num_out_fifo_bytes(ines_priv) < fifo_threshold || test_bit(BUS_ERROR_BN, &nec_priv->state) || test_bit(DEV_CLEAR_BN, &nec_priv->state) || - test_bit(TIMO_NUM, &board->status))) { - dev_dbg(board->gpib_dev, "gpib write interrupted\n"); + test_bit(TIMO_NUM, &board->status))) return -ERESTARTSYS; - } + if (test_bit(BUS_ERROR_BN, &nec_priv->state)) return -EIO; if (test_bit(DEV_CLEAR_BN, &nec_priv->state)) @@ -301,7 +301,7 @@ irqreturn_t ines_interrupt(gpib_board_t *board) wake++; } if (isr3_bits & FIFO_ERROR_BIT) - pr_err("ines gpib: fifo error\n"); + dev_err(board->gpib_dev, "fifo error\n"); if (isr3_bits & XFER_COUNT_BIT) wake++; =20 @@ -769,16 +769,16 @@ static int ines_common_pci_attach(gpib_board_t *board= , const gpib_board_config_t } while (1); } if (!ines_priv->pci_device) { - pr_err("gpib: could not find ines PCI board\n"); + dev_err(board->gpib_dev, "could not find ines PCI board\n"); return -1; } =20 if (pci_enable_device(ines_priv->pci_device)) { - pr_err("error enabling pci device\n"); + dev_err(board->gpib_dev, "error enabling pci device\n"); return -1; } =20 - if (pci_request_regions(ines_priv->pci_device, "ines-gpib")) + if (pci_request_regions(ines_priv->pci_device, DRV_NAME)) return -1; nec_priv->iobase =3D pci_resource_start(ines_priv->pci_device, found_id.gpib_region); @@ -797,7 +797,7 @@ static int ines_common_pci_attach(gpib_board_t *board, = const gpib_board_config_t case PCI_CHIP_QUICKLOGIC5030: break; default: - pr_err("gpib: unspecified chip type? (bug)\n"); + dev_err(board->gpib_dev, "unspecified chip type? (bug)\n"); nec_priv->iobase =3D 0; pci_release_regions(ines_priv->pci_device); return -1; @@ -813,8 +813,8 @@ static int ines_common_pci_attach(gpib_board_t *board, = const gpib_board_config_t #endif isr_flags |=3D IRQF_SHARED; if (request_irq(ines_priv->pci_device->irq, ines_pci_interrupt, isr_flags, - "pci-gpib", board)) { - pr_err("gpib: can't request IRQ %d\n", ines_priv->pci_device->irq); + DRV_NAME, board)) { + dev_err(board->gpib_dev, "can't request IRQ %d\n", ines_priv->pci_device= ->irq); return -1; } ines_priv->irq =3D ines_priv->pci_device->irq; @@ -846,7 +846,7 @@ static int ines_common_pci_attach(gpib_board_t *board, = const gpib_board_config_t case PCI_CHIP_QUICKLOGIC5030: break; default: - pr_err("gpib: unspecified chip type? (bug)\n"); + dev_err(board->gpib_dev, "unspecified chip type? (bug)\n"); return -1; } =20 @@ -899,15 +899,16 @@ int ines_isa_attach(gpib_board_t *board, const gpib_b= oard_config_t *config) ines_priv =3D board->private_data; nec_priv =3D &ines_priv->nec7210_priv; =20 - if (!request_region(config->ibbase, ines_isa_iosize, "ines_gpib")) { - pr_err("ines_gpib: ioports at 0x%x already in use\n", config->ibbase); - return -1; + if (!request_region(config->ibbase, ines_isa_iosize, DRV_NAME)) { + dev_err(board->gpib_dev, "ioports at 0x%x already in use\n", + config->ibbase); + return -EBUSY; } nec_priv->iobase =3D config->ibbase; nec_priv->offset =3D 1; nec7210_board_reset(nec_priv, board); - if (request_irq(config->ibirq, ines_pci_interrupt, isr_flags, "ines_gpib"= , board)) { - pr_err("ines_gpib: failed to allocate IRQ %d\n", config->ibirq); + if (request_irq(config->ibirq, ines_pci_interrupt, isr_flags, DRV_NAME, b= oard)) { + dev_err(board->gpib_dev, "failed to allocate IRQ %d\n", config->ibirq); return -1; } ines_priv->irq =3D config->ibirq; @@ -988,13 +989,6 @@ static struct pci_driver ines_pci_driver =3D { #include #include =20 -#ifdef PCMCIA_DEBUG -static int pc_debug =3D PCMCIA_DEBUG; -#define DEBUG(n, args...) do {if (pc_debug > (n)) pr_debug(args)} while (0) -#else -#define DEBUG(args...) -#endif - static const int ines_pcmcia_iosize =3D 0x20; =20 /* The event() function is this driver's Card Services event handler. @@ -1063,8 +1057,6 @@ static int ines_gpib_probe(struct pcmcia_device *link) =20 // int ret, i; =20 - DEBUG(0, "%s(0x%p)\n", __func__ link); - /* Allocate space for private device-specific data */ info =3D kzalloc(sizeof(*info), GFP_KERNEL); if (!info) @@ -1098,8 +1090,6 @@ static void ines_gpib_remove(struct pcmcia_device *li= nk) struct local_info *info =3D link->priv; //struct gpib_board_t *dev =3D info->dev; =20 - DEBUG(0, "%s(0x%p)\n", __func__, link); - if (info->dev) ines_pcmcia_detach(info->dev); ines_gpib_release(link); @@ -1125,7 +1115,6 @@ static int ines_gpib_config(struct pcmcia_device *lin= k) void __iomem *virt; =20 dev =3D link->priv; - DEBUG(0, "%s(0x%p)\n", __func__, link); =20 retval =3D pcmcia_loop_config(link, &ines_gpib_config_iteration, NULL); if (retval) { @@ -1134,8 +1123,8 @@ static int ines_gpib_config(struct pcmcia_device *lin= k) return -ENODEV; } =20 - pr_debug("ines_cs: manufacturer: 0x%x card: 0x%x\n", - link->manf_id, link->card_id); + dev_dbg(&link->dev, "ines_cs: manufacturer: 0x%x card: 0x%x\n", + link->manf_id, link->card_id); =20 /* for the ines card we have to setup the configuration registers in * attribute memory here @@ -1167,7 +1156,6 @@ static int ines_gpib_config(struct pcmcia_device *lin= k) ines_gpib_release(link); return -ENODEV; } - pr_info("ines gpib device loaded\n"); return 0; } /* gpib_config */ =20 @@ -1179,7 +1167,6 @@ static int ines_gpib_config(struct pcmcia_device *lin= k) =20 static void ines_gpib_release(struct pcmcia_device *link) { - DEBUG(0, "%s(0x%p)\n", __func__, link); pcmcia_disable_device(link); } /* gpib_release */ =20 @@ -1187,10 +1174,9 @@ static int ines_gpib_suspend(struct pcmcia_device *l= ink) { //struct local_info *info =3D link->priv; //struct gpib_board_t *dev =3D info->dev; - DEBUG(0, "%s(0x%p)\n", __func__, link); =20 if (link->open) - pr_err("Device still open ???\n"); + dev_err(&link->dev, "Device still open\n"); //netif_device_detach(dev); =20 return 0; @@ -1200,11 +1186,9 @@ static int ines_gpib_resume(struct pcmcia_device *li= nk) { //struct local_info_t *info =3D link->priv; //struct gpib_board_t *dev =3D info->dev; - DEBUG(0, "%s(0x%p)\n", __func__, link); =20 /*if (link->open) { * ni_gpib_probe(dev); / really? - * printk("Gpib resumed ???\n"); * //netif_device_attach(dev); *} */ @@ -1229,7 +1213,6 @@ static struct pcmcia_driver ines_gpib_cs_driver =3D { =20 void ines_pcmcia_cleanup_module(void) { - DEBUG(0, "ines_cs: unloading\n"); pcmcia_unregister_driver(&ines_gpib_cs_driver); } =20 @@ -1331,7 +1314,7 @@ int ines_common_pcmcia_attach(gpib_board_t *board) int retval; =20 if (!curr_dev) { - pr_err("no ines pcmcia cards found\n"); + dev_err(board->gpib_dev, "no ines pcmcia cards found\n"); return -1; } =20 @@ -1343,9 +1326,9 @@ int ines_common_pcmcia_attach(gpib_board_t *board) nec_priv =3D &ines_priv->nec7210_priv; =20 if (!request_region(curr_dev->resource[0]->start, - resource_size(curr_dev->resource[0]), "ines_gpib")) { - pr_err("ines_gpib: ioports at 0x%lx already in use\n", - (unsigned long)(curr_dev->resource[0]->start)); + resource_size(curr_dev->resource[0]), DRV_NAME)) { + dev_err(board->gpib_dev, "ioports at 0x%lx already in use\n", + (unsigned long)(curr_dev->resource[0]->start)); return -1; } =20 @@ -1355,7 +1338,7 @@ int ines_common_pcmcia_attach(gpib_board_t *board) =20 if (request_irq(curr_dev->irq, ines_pcmcia_interrupt, IRQF_SHARED, "pcmcia-gpib", board)) { - pr_err("gpib: can't request IRQ %d\n", curr_dev->irq); + dev_err(board->gpib_dev, "can't request IRQ %d\n", curr_dev->irq); return -1; } ines_priv->irq =3D curr_dev->irq; @@ -1418,56 +1401,56 @@ static int __init ines_init_module(void) =20 ret =3D pci_register_driver(&ines_pci_driver); if (ret) { - pr_err("ines_gpib: pci_register_driver failed: error =3D %d\n", ret); + pr_err("pci_register_driver failed: error =3D %d\n", ret); return ret; } =20 ret =3D gpib_register_driver(&ines_pci_interface, THIS_MODULE); if (ret) { - pr_err("ines_gpib: gpib_register_driver failed: error =3D %d\n", ret); + pr_err("gpib_register_driver failed: error =3D %d\n", ret); goto err_pci; } =20 ret =3D gpib_register_driver(&ines_pci_unaccel_interface, THIS_MODULE); if (ret) { - pr_err("ines_gpib: gpib_register_driver failed: error =3D %d\n", ret); + pr_err("gpib_register_driver failed: error =3D %d\n", ret); goto err_pci_unaccel; } =20 ret =3D gpib_register_driver(&ines_pci_accel_interface, THIS_MODULE); if (ret) { - pr_err("ines_gpib: gpib_register_driver failed: error =3D %d\n", ret); + pr_err("gpib_register_driver failed: error =3D %d\n", ret); goto err_pci_accel; } =20 ret =3D gpib_register_driver(&ines_isa_interface, THIS_MODULE); if (ret) { - pr_err("ines_gpib: gpib_register_driver failed: error =3D %d\n", ret); + pr_err("gpib_register_driver failed: error =3D %d\n", ret); goto err_isa; } =20 #ifdef CONFIG_GPIB_PCMCIA ret =3D gpib_register_driver(&ines_pcmcia_interface, THIS_MODULE); if (ret) { - pr_err("ines_gpib: gpib_register_driver failed: error =3D %d\n", ret); + pr_err("gpib_register_driver failed: error =3D %d\n", ret); goto err_pcmcia; } =20 ret =3D gpib_register_driver(&ines_pcmcia_unaccel_interface, THIS_MODULE); if (ret) { - pr_err("ines_gpib: gpib_register_driver failed: error =3D %d\n", ret); + pr_err("gpib_register_driver failed: error =3D %d\n", ret); goto err_pcmcia_unaccel; } =20 ret =3D gpib_register_driver(&ines_pcmcia_accel_interface, THIS_MODULE); if (ret) { - pr_err("ines_gpib: gpib_register_driver failed: error =3D %d\n", ret); + pr_err("gpib_register_driver failed: error =3D %d\n", ret); goto err_pcmcia_accel; } =20 ret =3D pcmcia_register_driver(&ines_gpib_cs_driver); if (ret) { - pr_err("ines_gpib: pcmcia_register_driver failed: error =3D %d\n", ret); + pr_err("pcmcia_register_driver failed: error =3D %d\n", ret); goto err_pcmcia_driver; } #endif --=20 2.48.1 From nobody Thu Mar 13 08:35:05 2025 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (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 112F3265608 for ; Fri, 14 Feb 2025 11:47:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739533675; cv=none; b=gHKkF+zyjAKE6gYNdRG3y7w4VFLuesmRlSkVKQThtwhIWnniJ4qtHhnS+WFyIEJRAd5GqFRuHWIRZVJj79Qoc8BUuygi6CehPxEOCBvyDQEgSAf+VlBfcgYggSnr9zBwKgglf0HqIu7LnOx/HpCz6BxNY01/AlEuwBfivimgJkg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739533675; c=relaxed/simple; bh=/4PdviiYt/uI2VjlPk045lO71+KN43mMIJ9DUGFAiYI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IDkyDc+Iiv5b6gdAsZo4POgbyk3qk038XyfQasR5q8ioGc2nSYkxNljhRt2Xt7jasi0gGyCTZeJ07lkF+TDS5Fb2S2BIHL+QBkcn75W/CrId2UyHsijcImrG63pZ9t0kxoFU1vZrmblI8utI1imY/WvF+lLXcdf/4X/pMk9o2VI= 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=itDzPAtv; arc=none smtp.client-ip=209.85.128.52 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="itDzPAtv" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-4394345e4d5so14118875e9.0 for ; Fri, 14 Feb 2025 03:47:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739533669; x=1740138469; 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=POdK9nTH3A8yWd11yKaU9NucRt1pKsLdjFtHwWKgO1A=; b=itDzPAtv0wyqXawoXg7XRPnMkB2HdStgod+HqYj6bXw8CdSJPVgl7OiF5FC/2KkUsa q3oz6qz7UmQbMI2mrLhqFtUaJ4M26NkPph2UMhT6YFRiWYRbsKuhdMBGCmD4fYJS7K9W VWRMfbTX2fMVY0aZklSEW+1E39X06etgeK+5IJUnrfHaVs8yvcnWkH5rc9bStzD1fsNu 8Igorq2paGWjeZayIipF9ZTDdtFEigmMy1ffQeeK40XgH1qJDHrDyQq4C3i1r8Lx7DXy U1eYg2kp6FwqGFDDSZf5Kw5l/JfyXjo+YVs183BfyDtwW1gaDm05A5qGNWzcbdflqOhX afsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739533669; x=1740138469; 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=POdK9nTH3A8yWd11yKaU9NucRt1pKsLdjFtHwWKgO1A=; b=DAlE1PAks/HT/8Vr5ZBNjJiNcB1DY2oKzy0DypBIQz5PKEdiPl+SpZ6qu5ONwp/RQW sVqAO0HqpPgJmwOAzlRuUKuKt3eCW6p5stm8v0Hdfr7fD1AuESWacLA9hQW9btm4GUuM yeUIa3xfUC0PHgXojrV++H5d2w5rpMMow02gZPoL22v4yGnW3FVS8tjNe7IK35aK/I/w MemC4Vw2AH8dhdhtmpH1Q3e1tw++fzVWtwZVy1QHzfTXeqgT/Cpm5WXhgnjCGCr/2pXn UNVR3qBX8RMYtLMmptT6jLDzKTgcH8mOU3SZQ4dEsHnVZDz/am/8I9GjXP1Y1kBwjFf/ NIJg== X-Forwarded-Encrypted: i=1; AJvYcCW+dPIAvFjPyMGZNWCQBnVLOO+d6ESTlA3o9jFMEseTSDpZo4374SkF5h5kIRVgyfBQ0elrAIgCjO/xs60=@vger.kernel.org X-Gm-Message-State: AOJu0YzBGxvzoCQTZvEoOIzdXjI/1mr/d8QgOYawS2lQJor1ooHYIb9+ 5sxYfxRyIEUwv7kwKIJdd2HeN/T4+FRFMAwPKdkj5Z+MHDC0rDx7 X-Gm-Gg: ASbGncuN5eH93G7qSDIzklcXX/ZuGqBzbKzJ8RNm6lmxzpz31997GYSRhWwHlNGBpiD 6Qfoz9c+P3GVVJQnmw6CVBBfVkAhJOttVjfX/s02hmQkHDFJfnqTgt9CI98G2mEZONAMdC6h0Zd 5hyorN9E5IBcN5i/C2pZl6FSDwkrry6IFm7svj1bNj0v985RXxXOX8b7teH8MpFXSRv/51pJ00G 35ebRIB2yPWERNs+lKzgTbnjnlDxtRmkjsM+19E0dLdpkEDVA38YRexCF2qtrnEKr6yTVp4OKwF T98jNgc0IpcMA58g8MwbUNgXvPtq7jyzjp0Dux34x53C31/0Y1o= X-Google-Smtp-Source: AGHT+IHJKG2K4YmU15vtspOIxqR+/Rpe0gwQ1KrB2sV6zBD3C0zeYy5iY/jXZhHptJawYq7FdwJo7A== X-Received: by 2002:a05:600c:c15:b0:439:4db6:43ad with SMTP id 5b1f17b1804b1-439581b931amr105736125e9.21.1739533669060; Fri, 14 Feb 2025 03:47:49 -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.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Feb 2025 03:47:48 -0800 (PST) From: Dave Penkler To: gregkh@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Dave Penkler Subject: [PATCH 12/17] staging: gpib: lpvo console messaging cleanup Date: Fri, 14 Feb 2025 12:47:03 +0100 Message-ID: <20250214114708.28947-13-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 Replace #define NAME "lpvo_usb_gpib" with KBUILD_MODNAME Update comments about Diagnostics and Debug Use dev_dbg instead of pr_alert in the DIA_LOG macro definition Remove TTY_LOG macro and its uses. There are non-console applications where this no longer makes sense. Remove commented printk's Remove now useless function printable(). Remove board parameter from SHOW_STATUS as it shadows the variable in the function. Remove the printing of the board pointer in SHOW_STATUS. Change select DIA_LOG(0,... to dev_err where we need an error message. Remove loops for printing message buffer contents. Remove dev_alerts for read errors. Change dev_alert to dev_err. Change some TTY_LOG to DIA_LOG(0,.. e.g. for attach and detach messages. Remove NAME parameter in dev_dbg as this is printed with the module name. Remove __func__ parameter in dev_dbg as this can be enabled by dynamic debug. Remove NOP message for unsuppoted functionality. Remove "lpvo_usb_gpib:" prefix in register driver pr_err as it is printed with the module name. Signed-off-by: Dave Penkler --- .../gpib/lpvo_usb_gpib/lpvo_usb_gpib.c | 255 ++++++------------ 1 file changed, 76 insertions(+), 179 deletions(-) diff --git a/drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c b/drivers/s= taging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c index 85322af62c23..50faa0c17617 100644 --- a/drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c +++ b/drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c @@ -8,6 +8,10 @@ * copyright : (C) 2011 Marcello Carla' * *************************************************************************= **/ =20 +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#define dev_fmt pr_fmt +#define NAME KBUILD_MODNAME + /* base module includes */ =20 #include @@ -31,8 +35,6 @@ MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("GPIB driver for LPVO usb devices"); =20 -#define NAME "lpvo_usb_gpib" - /* * Table of devices that work with this driver. * @@ -55,10 +57,11 @@ MODULE_DEVICE_TABLE(usb, skel_table); =20 /* * *** Diagnostics and Debug *** - * + * To enable the diagnostic and debug messages either compile with DEBUG = set + * or control via the dynamic debug mechanisms. * The module parameter "debug" controls the sending of debug messages to - * syslog. By default it is set to 0 or 1 according to GPIB_CONFIG_KERNEL= _DEBUG. - * debug =3D 0: only register/deregister messages are generated + * syslog. By default it is set to 0 + * debug =3D 0: only attach/detach messages are sent * 1: every action is logged * 2: extended logging; each single exchanged byte is documented * (about twice the log volume of [1]) @@ -70,9 +73,9 @@ MODULE_DEVICE_TABLE(usb, skel_table); static int debug; module_param(debug, int, 0644); =20 -#define DIA_LOG(level, format, ...) \ +#define DIA_LOG(level, format, ...) \ do { if (debug >=3D (level)) \ - pr_alert("%s:%s - " format, NAME, __func__, ## __VA_ARGS__); } \ + dev_dbg(board->gpib_dev, format, ## __VA_ARGS__); } \ while (0) =20 /* standard and extended command sets of the usb-gpib adapter */ @@ -135,7 +138,7 @@ struct char_buf { /* used by one_char() routine */ }; =20 struct usb_gpib_priv { /* private data to the device */ - u8 eos; /* eos character */ + u8 eos; /* eos character */ short eos_flags; /* eos mode */ int timeout; /* current value for timeout */ void *dev; /* the usb device private data structure */ @@ -143,42 +146,23 @@ struct usb_gpib_priv { /* private data to the device= */ =20 #define GPIB_DEV (((struct usb_gpib_priv *)board->private_data)->dev) =20 -#define SHOW_STATUS(board) { \ - DIA_LOG(2, "# - board %p\n", board); \ - DIA_LOG(2, "# - buffer_length %d\n", board->buffer_length); \ - DIA_LOG(2, "# - status %lx\n", board->status); \ - DIA_LOG(2, "# - use_count %d\n", board->use_count); \ - DIA_LOG(2, "# - pad %x\n", board->pad); \ - DIA_LOG(2, "# - sad %x\n", board->sad); \ - DIA_LOG(2, "# - timeout %d\n", board->usec_timeout); \ - DIA_LOG(2, "# - ppc %d\n", board->parallel_poll_configuration); \ - DIA_LOG(2, "# - t1delay %d\n", board->t1_nano_sec); \ - DIA_LOG(2, "# - online %d\n", board->online); \ - DIA_LOG(2, "# - autopoll %d\n", board->autospollers); \ - DIA_LOG(2, "# - autopoll task %p\n", board->autospoll_task); \ - DIA_LOG(2, "# - minor %d\n", board->minor); \ - DIA_LOG(2, "# - master %d\n", board->master); \ - DIA_LOG(2, "# - list %d\n", board->ist); \ - } -/* - * n =3D 0; - * list_for_each (l, &board->device_list) n++; - * TTY_LOG ("%s:%s - devices in list %d\n", a, b, n); - */ - -/* - * TTY_LOG - write a message to the current work terminal (if any) - */ - -#define TTY_LOG(format, ...) { \ - char buf[128]; \ - struct tty_struct *tty =3D get_current_tty(); \ - if (tty) { \ - snprintf(buf, 128, format, __VA_ARGS__); \ - tty->driver->ops->write(tty, buf, strlen(buf)); \ - tty->driver->ops->write(tty, "\r", 1); \ - } \ - } +static void show_status(gpib_board_t *board) +{ + DIA_LOG(2, "# - buffer_length %d\n", board->buffer_length); + DIA_LOG(2, "# - status %lx\n", board->status); + DIA_LOG(2, "# - use_count %d\n", board->use_count); + DIA_LOG(2, "# - pad %x\n", board->pad); + DIA_LOG(2, "# - sad %x\n", board->sad); + DIA_LOG(2, "# - timeout %d\n", board->usec_timeout); + DIA_LOG(2, "# - ppc %d\n", board->parallel_poll_configuration); + DIA_LOG(2, "# - t1delay %d\n", board->t1_nano_sec); + DIA_LOG(2, "# - online %d\n", board->online); + DIA_LOG(2, "# - autopoll %d\n", board->autospollers); + DIA_LOG(2, "# - autopoll task %p\n", board->autospoll_task); + DIA_LOG(2, "# - minor %d\n", board->minor); + DIA_LOG(2, "# - master %d\n", board->master); + DIA_LOG(2, "# - list %d\n", board->ist); +} =20 /* * GLOBAL VARIABLES: required for @@ -236,8 +220,6 @@ static int write_loop(void *dev, char *msg, int leng) return skel_do_write(dev, msg, leng); =20 // if (val < 1) { -// printk (KERN_ALERT "%s:%s - write error: %d %d/%d\n", -// NAME, __func__, val, nchar, leng); // return -EIO; // } // nchar +=3Dval; @@ -245,13 +227,6 @@ static int write_loop(void *dev, char *msg, int leng) // return leng; } =20 -static char printable(char x) -{ - if (x < 32 || x > 126) - return ' '; - return x; -} - /** * send_command() - Send a byte sequence and return a single byte reply. * @@ -265,7 +240,7 @@ static char printable(char x) static int send_command(gpib_board_t *board, char *msg, int leng) { char buffer[64]; - int nchar, j; + int nchar; int retval; struct timespec64 before, after; =20 @@ -280,17 +255,10 @@ static int send_command(gpib_board_t *board, char *ms= g, int leng) nchar =3D skel_do_read(GPIB_DEV, buffer, 64); =20 if (nchar < 0) { - DIA_LOG(0, " return from read: %d\n", nchar); + dev_err(board->gpib_dev, " return from read: %d\n", nchar); return nchar; } else if (nchar !=3D 1) { - for (j =3D 0 ; j < leng ; j++) { - DIA_LOG(0, " Irregular reply to command: %d %x %c\n", - j, msg[j], printable(msg[j])); - } - for (j =3D 0 ; j < nchar ; j++) { - DIA_LOG(0, " Irregular command reply: %d %x %c\n", - j, buffer[j] & 0xff, printable(buffer[j])); - } + dev_err(board->gpib_dev, " Irregular reply to command: %s\n", msg); return -EIO; } ktime_get_real_ts64 (&after); @@ -337,8 +305,8 @@ static int set_control_line(gpib_board_t *board, int li= ne, int value) /* * one_char() - read one single byte from input buffer * - * @board: the gpib_board_struct data area for this gpib interface - * @char_buf: the routine private data structure + * @board: the gpib_board_struct data area for this gpib interface + * @char_buf: the routine private data structure */ =20 static int one_char(gpib_board_t *board, struct char_buf *b) @@ -360,13 +328,7 @@ static int one_char(gpib_board_t *board, struct char_b= uf *b) if (b->nchar > 0) { DIA_LOG(2, "--> %x\n", b->inbuf[b->last - b->nchar]); return b->inbuf[b->last - b->nchar--]; - } else if (b->nchar =3D=3D 0) { - dev_alert(board->gpib_dev, "%s:%s - read returned EOF\n", NAME, __func__= ); - return -EIO; } - 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; } =20 @@ -406,12 +368,10 @@ static void set_timeout(gpib_board_t *board) val =3D send_command(board, command, 0); } =20 - if (val !=3D ACK) { - dev_alert(board->gpib_dev, "%s:%s - error in timeout set: <%s>\n", - NAME, __func__, command); - } else { + if (val !=3D ACK) + dev_err(board->gpib_dev, "error in timeout set: <%s>\n", command); + else data->timeout =3D board->usec_timeout; - } } =20 /* @@ -451,8 +411,6 @@ static int usb_gpib_attach(gpib_board_t *board, const g= pib_board_config_t *confi =20 if (config->device_path) { /* if config->device_path given, try that first */ - dev_alert(board->gpib_dev, "%s:%s - Looking for device_path: %s\n", - NAME, __func__, config->device_path); for (j =3D 0 ; j < MAX_DEV ; j++) { if ((assigned_usb_minors & 1 << j) =3D=3D 0) continue; @@ -487,8 +445,7 @@ static int usb_gpib_attach(gpib_board_t *board, const g= pib_board_config_t *confi mutex_unlock(&minors_lock); =20 if (j =3D=3D MAX_DEV) { - dev_alert(board->gpib_dev, "%s:%s - Requested device is not registered.\= n", - NAME, __func__); + dev_err(board->gpib_dev, "Requested device is not registered.\n"); return -EIO; } =20 @@ -501,13 +458,13 @@ static int usb_gpib_attach(gpib_board_t *board, const= gpib_board_config_t *confi DIA_LOG(1, "Skel open: %d\n", retval); =20 if (retval) { - TTY_LOG("%s:%s - skel open failed.\n", NAME, __func__); + dev_err(board->gpib_dev, "skel open failed.\n"); kfree(board->private_data); board->private_data =3D NULL; return -ENODEV; } =20 - SHOW_STATUS(board); + show_status(board); =20 retval =3D send_command(board, USB_GPIB_ON, 0); DIA_LOG(1, "USB_GPIB_ON returns %x\n", retval); @@ -541,8 +498,8 @@ static int usb_gpib_attach(gpib_board_t *board, const g= pib_board_config_t *confi if (retval !=3D ACK) return -EIO; =20 - SHOW_STATUS(board); - TTY_LOG("Module '%s' has been sucesfully configured\n", NAME); + show_status(board); + DIA_LOG(0, "attached\n"); return 0; } =20 @@ -557,9 +514,9 @@ static void usb_gpib_detach(gpib_board_t *board) { int retval; =20 - SHOW_STATUS(board); + show_status(board); =20 - DIA_LOG(0, "detaching %p\n", board); + DIA_LOG(0, "detaching\n"); =20 if (board->private_data) { if (GPIB_DEV) { @@ -573,8 +530,7 @@ static void usb_gpib_detach(gpib_board_t *board) board->private_data =3D NULL; } =20 - DIA_LOG(0, "done %p\n", board); - TTY_LOG("Module '%s' has been detached\n", NAME); + DIA_LOG(0, "detached\n"); } =20 /* @@ -733,8 +689,7 @@ static int usb_gpib_line_status(const gpib_board_t *boa= rd) buffer =3D send_command((gpib_board_t *)board, USB_GPIB_STATUS, 0); =20 if (buffer < 0) { - dev_alert(board->gpib_dev, "%s:%s - line status read failed with %d\n", - NAME, __func__, buffer); + dev_err(board->gpib_dev, "line status read failed with %d\n", buffer); return -1; } =20 @@ -773,20 +728,16 @@ static int usb_gpib_parallel_poll(gpib_board_t *board= , uint8_t *result) DIA_LOG(1, "enter %p\n", board); =20 retval =3D set_control_line(board, IB_BUS_EOI, 1); - if (retval !=3D ACK) { - dev_alert(board->gpib_dev, "%s:%s - assert EOI failed\n", NAME, __func__= ); + if (retval !=3D ACK) return -EIO; - } =20 *result =3D send_command(board, USB_GPIB_READ_DATA, 0); =20 DIA_LOG(1, "done with %x\n", *result); =20 retval =3D set_control_line(board, IB_BUS_EOI, 0); - if (retval !=3D 0x06) { - dev_alert(board->gpib_dev, "%s:%s - unassert EOI failed\n", NAME, __func= __); + if (retval !=3D 0x06) return -EIO; - } =20 return 0; } @@ -866,8 +817,7 @@ static int usb_gpib_read(gpib_board_t *board, goto read_return; =20 if (one_char(board, &b) !=3D DLE || one_char(board, &b) !=3D STX) { - dev_alert(board->gpib_dev, "%s:%s - wrong sequence\n", - NAME, __func__); + dev_err(board->gpib_dev, "wrong sequence\n"); retval =3D -EIO; goto read_return; } @@ -907,15 +857,12 @@ static int usb_gpib_read(gpib_board_t *board, retval =3D 0; goto read_return; } else { - dev_alert(board->gpib_dev, "%s:%s - %s %x\n", - NAME, __func__, - "Wrong end of message", c); + dev_err(board->gpib_dev, "wrong end of message %x", c); retval =3D -ETIME; goto read_return; } } else { - dev_alert(board->gpib_dev, "%s:%s - %s\n", NAME, __func__, - "lone in stream"); + dev_err(board->gpib_dev, "lone in stream"); retval =3D -EIO; goto read_return; } @@ -934,8 +881,7 @@ static int usb_gpib_read(gpib_board_t *board, c =3D one_char(board, &b); if (c =3D=3D ACK) { if (MAX_READ_EXCESS - read_count > 1) - dev_alert(board->gpib_dev, "%s:%s - %s\n", NAME, __func__, - "small buffer - maybe some data lost"); + dev_dbg(board->gpib_dev, "small buffer - maybe some data lost"); retval =3D 0; goto read_return; } @@ -943,15 +889,13 @@ static int usb_gpib_read(gpib_board_t *board, } } =20 - dev_alert(board->gpib_dev, "%s:%s - no input end - GPIB board in odd stat= e\n", - NAME, __func__); + dev_err(board->gpib_dev, "no input end - board in odd state\n"); retval =3D -EIO; =20 read_return: kfree(b.inbuf); =20 - DIA_LOG(1, "done with byte/status: %d %x %d\n", - (int)*bytes_read, retval, *end); + DIA_LOG(1, "done with byte/status: %d %x %d\n", (int)*bytes_read, retval,= *end); =20 if (retval =3D=3D 0 || retval =3D=3D -ETIME) { if (send_command(board, USB_GPIB_UNTALK, sizeof(USB_GPIB_UNTALK)) =3D=3D= 0x06) @@ -970,8 +914,7 @@ static void usb_gpib_remote_enable(gpib_board_t *board,= int enable) =20 retval =3D set_control_line(board, IB_BUS_REN, enable ? 1 : 0); if (retval !=3D ACK) - dev_alert(board->gpib_dev, "%s:%s - could not set REN line: %x\n", - NAME, __func__, retval); + dev_err(board->gpib_dev, "could not set REN line: %x\n", retval); =20 DIA_LOG(1, "done with %x\n", retval); } @@ -1053,9 +996,8 @@ static int usb_gpib_write(gpib_board_t *board, =20 *bytes_written =3D length; =20 - if (send_command(board, USB_GPIB_UNLISTEN, sizeof(USB_GPIB_UNLISTEN)) - !=3D 0x06) - return -EPIPE; + if (send_command(board, USB_GPIB_UNLISTEN, sizeof(USB_GPIB_UNLISTEN)) != =3D 0x06) + return -EPIPE; =20 return length; } @@ -1069,21 +1011,18 @@ static int usb_gpib_write(gpib_board_t *board, static void usb_gpib_parallel_poll_configure(gpib_board_t *board, uint8_t configuration) { - dev_alert(board->gpib_dev, "%s:%s - currently a NOP\n", NAME, __func__); } =20 /* parallel_poll_response */ =20 static void usb_gpib_parallel_poll_response(gpib_board_t *board, int ist) { - dev_alert(board->gpib_dev, "%s:%s - currently a NOP\n", NAME, __func__); } =20 /* primary_address */ =20 static int usb_gpib_primary_address(gpib_board_t *board, unsigned int add= ress) { - dev_alert(board->gpib_dev, "%s:%s - currently a NOP\n", NAME, __func__); return 0; } =20 @@ -1091,7 +1030,6 @@ static int usb_gpib_primary_address(gpib_board_t *bo= ard, unsigned int address) =20 static void usb_gpib_return_to_local(gpib_board_t *board) { - dev_alert(board->gpib_dev, "%s:%s - currently a NOP\n", NAME, __func__); } =20 /* secondary_address */ @@ -1100,7 +1038,6 @@ static int usb_gpib_secondary_address(gpib_board_t *b= oard, unsigned int address, int enable) { - dev_alert(board->gpib_dev, "%s:%s - currently a NOP\n", NAME, __func__); return 0; } =20 @@ -1108,14 +1045,12 @@ static int usb_gpib_secondary_address(gpib_board_t = *board, =20 static void usb_gpib_serial_poll_response(gpib_board_t *board, uint8_t sta= tus) { - dev_alert(board->gpib_dev, "%s:%s - currently a NOP\n", NAME, __func__); } =20 /* serial_poll_status */ =20 static uint8_t usb_gpib_serial_poll_status(gpib_board_t *board) { - dev_alert(board->gpib_dev, "%s:%s - currently a NOP\n", NAME, __func__); return 0; } =20 @@ -1123,7 +1058,6 @@ static uint8_t usb_gpib_serial_poll_status(gpib_board= _t *board) =20 static unsigned int usb_gpib_t1_delay(gpib_board_t *board, unsigned int na= no_sec) { - dev_alert(board->gpib_dev, "%s:%s - currently a NOP\n", NAME, __func__); return 0; } =20 @@ -1181,7 +1115,7 @@ static int usb_gpib_init_module(struct usb_interface = *interface) if (!assigned_usb_minors) { rv =3D gpib_register_driver(&usb_gpib_interface, THIS_MODULE); if (rv) { - pr_err("lpvo_usb_gpib: gpib_register_driver failed: error =3D %d\n", rv= ); + pr_err("gpib_register_driver failed: error =3D %d\n", rv); goto exit; } } else { @@ -1191,8 +1125,8 @@ static int usb_gpib_init_module(struct usb_interface = *interface) =20 for (j =3D 0 ; j < MAX_DEV ; j++) { if (usb_minors[j] =3D=3D interface->minor && assigned_usb_minors & 1 <<= j) { - pr_alert("%s:%s - CODE BUG: USB minor %d registered at %d.\n", - NAME, __func__, interface->minor, j); + pr_err("CODE BUG: USB minor %d registered at %d.\n", + interface->minor, j); rv =3D -1; goto exit; } @@ -1207,13 +1141,11 @@ static int usb_gpib_init_module(struct usb_interfac= e *interface) usb_minors[j] =3D interface->minor; lpvo_usb_interfaces[j] =3D interface; assigned_usb_minors |=3D mask; - DIA_LOG(0, "usb minor %d registered at %d\n", interface->minor, j); rv =3D 0; goto exit; } } - pr_alert("%s:%s - No slot available for interface %p minor %d\n", - NAME, __func__, interface, interface->minor); + pr_err("No slot available for interface %p minor %d\n", interface, interf= ace->minor); rv =3D -1; =20 exit: @@ -1235,7 +1167,7 @@ static void usb_gpib_exit_module(int minor) goto exit; } } - pr_alert("%s:%s - CODE BUG: USB minor %d not found.\n", NAME, __func__, m= inor); + pr_err("CODE BUG: USB minor %d not found.\n", minor); =20 exit: mutex_unlock(&minors_lock); @@ -1267,7 +1199,7 @@ static int write_latency_timer(struct usb_device *ude= v) LATENCY_TIMER, LATENCY_CHANNEL, NULL, 0, WDR_TIMEOUT); if (rv < 0) - pr_alert("Unable to write latency timer: %i\n", rv); + dev_err(&udev->dev, "Unable to write latency timer: %i\n", rv); return rv; } =20 @@ -1369,12 +1301,9 @@ static int skel_do_open(gpib_board_t *board, int sub= minor) struct usb_interface *interface; int retval =3D 0; =20 - DIA_LOG(0, "Required minor: %d\n", subminor); - interface =3D usb_find_interface(&skel_driver, subminor); if (!interface) { - pr_err("%s - error, can't find device for minor %d\n", - __func__, subminor); + dev_err(board->gpib_dev, "can't find device for minor %d\n", subminor); retval =3D -ENODEV; goto exit; } @@ -1439,9 +1368,8 @@ static void skel_read_bulk_callback(struct urb *urb) if (!(urb->status =3D=3D -ENOENT || urb->status =3D=3D -ECONNRESET || urb->status =3D=3D -ESHUTDOWN)) - dev_err(&dev->interface->dev, - "%s - nonzero read bulk status received: %d\n", - __func__, urb->status); + dev_err(&dev->interface->dev, "nonzero read bulk status received: %d\n", + urb->status); =20 dev->errors =3D urb->status; } else { @@ -1478,9 +1406,7 @@ static int skel_do_read_io(struct usb_skel *dev, size= _t count) /* do it */ rv =3D usb_submit_urb(dev->bulk_in_urb, GFP_KERNEL); if (rv < 0) { - dev_err(&dev->interface->dev, - "%s - failed submitting read urb, error %d\n", - __func__, rv); + dev_err(&dev->interface->dev, "failed submitting read urb, error %d\n", = rv); rv =3D (rv =3D=3D -ENOMEM) ? rv : -EIO; spin_lock_irq(&dev->err_lock); dev->ongoing_read =3D 0; @@ -1504,14 +1430,10 @@ static ssize_t skel_do_read(struct usb_skel *dev, c= har *buffer, size_t count) if (!dev->bulk_in_urb || !count) return 0; =20 - DIA_LOG(1, "enter for %zu.\n", count); - restart: /* added to comply with ftdi timeout technique */ =20 /* no concurrent readers */ =20 - DIA_LOG(2, "restart with %zd %zd.\n", dev->bulk_in_filled, dev->bulk_in_c= opied); - rv =3D mutex_lock_interruptible(&dev->io_mutex); if (rv < 0) return rv; @@ -1527,8 +1449,6 @@ static ssize_t skel_do_read(struct usb_skel *dev, cha= r *buffer, size_t count) ongoing_io =3D dev->ongoing_read; spin_unlock_irq(&dev->err_lock); =20 - DIA_LOG(2, "retry with %d.\n", ongoing_io); - if (ongoing_io) { // /* nonblocking IO shall not wait */ // /* no file, no O_NONBLOCK; maybe provide when from user space */ @@ -1569,8 +1489,6 @@ static ssize_t skel_do_read(struct usb_skel *dev, cha= r *buffer, size_t count) // size_t chunk =3D min(available, count); /* compute chunk later */ size_t chunk; =20 - DIA_LOG(2, "we have data: %zu %zu.\n", dev->bulk_in_filled, dev->bulk_in= _copied); - if (!available) { /* * all data has been used @@ -1596,12 +1514,6 @@ static ssize_t skel_do_read(struct usb_skel *dev, ch= ar *buffer, size_t count) */ =20 if (dev->bulk_in_copied) { - int j; - - for (j =3D 0 ; j < dev->bulk_in_filled ; j++) { - pr_alert("copy -> %x %zu %x\n", - j, dev->bulk_in_copied, dev->bulk_in_buffer[j]); - } chunk =3D min(available, count); memcpy(buffer, dev->bulk_in_buffer + dev->bulk_in_copied, chunk); rv =3D chunk; @@ -1613,7 +1525,7 @@ static ssize_t skel_do_read(struct usb_skel *dev, cha= r *buffer, size_t count) /* account for two bytes to be discarded */ chunk =3D min(available, count + 2); if (chunk < 2) { - pr_alert("BAD READ - chunk: %zu\n", chunk); + dev_err(&dev->udev->dev, "BAD READ - chunk: %zu\n", chunk); rv =3D -EIO; goto exit; } @@ -1633,8 +1545,6 @@ static ssize_t skel_do_read(struct usb_skel *dev, cha= r *buffer, size_t count) // if (available < count) // skel_do_read_io(dev, dev->bulk_in_size); } else { - DIA_LOG(1, "no data - start read - copied: %zd.\n", dev->bulk_in_copied); - /* no data in the buffer */ rv =3D skel_do_read_io(dev, dev->bulk_in_size); if (rv < 0) @@ -1645,10 +1555,10 @@ static ssize_t skel_do_read(struct usb_skel *dev, c= har *buffer, size_t count) exit: mutex_unlock(&dev->io_mutex); if (rv =3D=3D 2) - goto restart; /* ftdi chip returns two status bytes after a latency an= yhow */ - DIA_LOG(1, "exit with %d.\n", rv); + goto restart; /* ftdi chip returns two status bytes after a latency anyh= ow */ + if (rv > 0) - return rv - 2; /* account for 2 discarded bytes in a valid buffer */ + return rv - 2; /* account for 2 discarded bytes in a valid buffer */ return rv; } =20 @@ -1669,8 +1579,7 @@ static void skel_write_bulk_callback(struct urb *urb) urb->status =3D=3D -ECONNRESET || urb->status =3D=3D -ESHUTDOWN)) dev_err(&dev->interface->dev, - "%s - nonzero write bulk status received: %d\n", - __func__, urb->status); + "nonzero write bulk status received: %d\n", urb->status); =20 spin_lock_irqsave(&dev->err_lock, flags); dev->errors =3D urb->status; @@ -1763,9 +1672,7 @@ static ssize_t skel_do_write(struct usb_skel *dev, co= nst char *buffer, size_t co retval =3D usb_submit_urb(urb, GFP_KERNEL); mutex_unlock(&dev->io_mutex); if (retval) { - dev_err(&dev->interface->dev, - "%s - failed submitting write urb, error %d\n", - __func__, retval); + dev_err(&dev->interface->dev, "failed submitting write urb, error %d\n",= retval); goto error_unanchor; } =20 @@ -1831,8 +1738,7 @@ static int skel_open(struct inode *inode, struct file= *file) =20 interface =3D usb_find_interface(&skel_driver, subminor); if (!interface) { - pr_err("%s - error, can't find device for minor %d\n", - __func__, subminor); + pr_err("can't find device for minor %d\n", subminor); retval =3D -ENODEV; goto exit; } @@ -1895,8 +1801,6 @@ static ssize_t skel_read(struct file *file, char __us= er *buffer, size_t count, =20 rv =3D skel_do_read(dev, buf, count); =20 - pr_alert("%s - return with %zu\n", __func__, rv); - if (rv > 0) { if (copy_to_user(buffer, buf, rv)) { kfree(buf); @@ -2015,8 +1919,8 @@ static int skel_probe(struct usb_interface *interface, /* let the world know */ =20 device_path =3D kobject_get_path(&dev->udev->dev.kobj, GFP_KERNEL); - pr_alert("%s:%s - New lpvo_usb_device -> bus: %d dev: %d path: %s\n", N= AME, __func__, - dev->udev->bus->busnum, dev->udev->devnum, device_path); + dev_dbg(&interface->dev, "New lpvo_usb_device -> bus: %d dev: %d path: = %s\n", + dev->udev->bus->busnum, dev->udev->devnum, device_path); kfree(device_path); =20 #if USER_DEVICE @@ -2029,14 +1933,9 @@ static int skel_probe(struct usb_interface *interfac= e, usb_set_intfdata(interface, NULL); goto error; } - - /* let the user know what node this device is now attached to */ - dev_info(&interface->dev, - "lpvo_usb_gpib device now attached to lpvo_raw%d", - interface->minor); #endif =20 - write_latency_timer(dev->udev); /* adjust the latency timer */ + write_latency_timer(dev->udev); /* adjust the latency timer */ =20 usb_gpib_init_module(interface); /* last, init the lpvo for this minor= */ =20 @@ -2073,8 +1972,6 @@ static void skel_disconnect(struct usb_interface *int= erface) =20 /* decrement our usage count */ kref_put(&dev->kref, skel_delete); - - dev_info(&interface->dev, "USB lpvo_raw #%d now disconnected", minor); } =20 static void skel_draw_down(struct usb_skel *dev) --=20 2.48.1 From nobody Thu Mar 13 08:35:05 2025 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (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 3EC48265CA6 for ; Fri, 14 Feb 2025 11:47:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739533674; cv=none; b=Ob0tyGSetm0TUx/tbg/3wf/zxH5vrhWXpmnMxGOT5izd5KihSljn88C3l8xhs+FYCVANTLh1sH5oQJopC0mqlmGI/Mc0ikxWL/lgKGCPSfXRUMreICl63fe3oVhmiQqQE43WRscfPhhWpJY5c6Tek/IkMST9pjKtZC++jVwHUsM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739533674; c=relaxed/simple; bh=/2y5Ij85lRs8S+WSb/h3IT1jUUdBZOw2Ah/gzuPydDc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lOBQdFcz+Sz3/HZvLRhx94YVLHIbbAmigVQ6PvPhif8kE3pbX5rPBQyjlrq0E7NvikDiTaJFs3ca36E21tt36AIwp4VYyOkjOzzcT4IT6HwtbYNQ+PizcotprYaWlPKwgfrTH6N57sX5oZPYJJD1Dof4ClkXQTVUgiKtPZCSrlU= 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=nXaUriyt; arc=none smtp.client-ip=209.85.128.41 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="nXaUriyt" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-43962f7b0e4so11143835e9.3 for ; Fri, 14 Feb 2025 03:47:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739533670; x=1740138470; 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=uB4hOZFIewklpFdCH6VWD2g5IlL1m3xWkE0ZKXuUefA=; b=nXaUriytBDUaRDCBKFoVn+2cv3uxJDaqqOeqeggm732ip24gqo8B+KLWQOEqkhhBbB 22euBzMWNBFXpzIdxmuiGs8SmO/LJbRreqoFjLzGSzGqW8yS38iyAW7QyPLp5MBbsjxE GpNfw68lIsT4p7wTqbsBDka8cF4NMIcNWK7U1Sz6iVph9Zzrs5tYkamtbx/vdE3LRlHn IInNPZ5Pq5nnqc2dNZi2krauDiSdGNIrzcTIwtlGIqfpK/tLEvZMRKjjGqxmamG9Ddvm iiROHjQNp2jGEIMXuRImOwmprU0ZrFbYeKECoDB1dhRa05/p5ULywucCdpY3W/mONJXt zu4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739533671; x=1740138471; 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=uB4hOZFIewklpFdCH6VWD2g5IlL1m3xWkE0ZKXuUefA=; b=my6qAjp+XScbHkvXIkzLmd6N4ytEGPi0zTLgIsGZ2llHQa7rRpDx+BlnNYX5RY3Uvd Sbj78+AamZfHRI3u9EvNAEgNzh2epg7L3Hxe50jZyl2Qk0A0mB8AMk6WadI8M4cDqrJy xwDCxC5jO/Hspx+8bDMKg/Z+qtroc04avjlTj8BjDA/vS7fQ3KyCsTyAePo4DGnS8KIc 0iBYiJb9LlD0z7uZHk5hpn5Saly18hBoZXNuUj7FbDy1+oXxv13UxdVXvDCAt/bbAmJg HHBpbTe0OJMsaa8xuzExsVueXcG7nsyvNKb7pMoBiWmMK1PAvSGkEEfeXR/oNcI3oYEN WUig== X-Forwarded-Encrypted: i=1; AJvYcCXKleTmJf9YK587JLjvPmgpiUHU2np59VLVQWzRbDysgdG5ar8npKcZbPR0Ij3Us9K2wx2g4FgX+itYnN4=@vger.kernel.org X-Gm-Message-State: AOJu0Yx2KvZZM6A+/tHyV6Q9YJgF6feHIq3qjUlh1wRCLPdE5AnV7VOr QlXqbdZ7/mkEfUTgYq+P0usvXD0T+3uoNaXKuvPa6/n7/XD1rCOt X-Gm-Gg: ASbGncv9F/gM443WXTX38HMSqZCaM28ZqC4FH9rzVEqjFYHCbA61OBUymtjzCyT1wyz M9fZw89kf7V8TXfudTyhlyj7k2Z32wgX2G1AdRvPVDNz0mt4vl2g1HrJJ/tzc9dCmxmPfbFzoag CTYPMRzHzyrTVPvYRDTJ9YOgI76RnfO7wGurUbqwa3/hh9FgrK5KNg1Tg/PkZZEEl7U4TbSdWrV tdMxUFS/HRCqkWXO9IrfxlCy7kzLPYq7XvBW+tDs+X0Dz8UN9Sa4vMZF67oI5VQZrEQBT1sqVxU RpD+3mi8tHlQiGD5wf94rRnC6wcWyktZTnBAnSdlvAyFLYqvMVE= X-Google-Smtp-Source: AGHT+IH9yD6xiYGyebswReZLqABY9aEdR4Sw+xMjIqJZPgV/z1rxOG/uQ0MApfISEwIcsNuRSGsQaA== X-Received: by 2002:a05:600c:a4a:b0:439:57b5:f8a0 with SMTP id 5b1f17b1804b1-439601ab838mr87445935e9.24.1739533670410; Fri, 14 Feb 2025 03:47:50 -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.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Feb 2025 03:47:49 -0800 (PST) From: Dave Penkler To: gregkh@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Dave Penkler Subject: [PATCH 13/17] staging: gpib: nec7210 console messaging cleanup Date: Fri, 14 Feb 2025 12:47:04 +0100 Message-ID: <20250214114708.28947-14-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 by default in dev_dbg Remove commented dev_dbg Remove pr_err on timeout and gpib bus error. Remove dev_dbg on wait interrupted, command timeout also read / write timeout, gpib bus error and interrupt. Remove commented printk and command variable initialization. Signed-off-by: Dave Penkler --- drivers/staging/gpib/nec7210/nec7210.c | 69 +++++++++----------------- 1 file changed, 23 insertions(+), 46 deletions(-) diff --git a/drivers/staging/gpib/nec7210/nec7210.c b/drivers/staging/gpib/= nec7210/nec7210.c index c9a837fad96e..85f1e79d658a 100644 --- a/drivers/staging/gpib/nec7210/nec7210.c +++ b/drivers/staging/gpib/nec7210/nec7210.c @@ -4,6 +4,8 @@ * copyright : (C) 2001, 2002 by Frank Mori Hess *************************************************************************= **/ =20 +#define dev_fmt(fmt) KBUILD_MODNAME ": " fmt + #include "board.h" #include #include @@ -198,7 +200,6 @@ unsigned int nec7210_update_status_nolock(gpib_board_t = *board, struct nec7210_pr priv->srq_pending =3D 0; set_bit(SPOLL_NUM, &board->status); } -// dev_dbg(board->gpib_dev, "status 0x%x, state 0x%x\n", board->status, pr= iv->state); =20 /* we rely on the interrupt handler to set the * rest of the status bits @@ -319,10 +320,8 @@ int nec7210_go_to_standby(gpib_board_t *board, struct = nec7210_priv *priv) if (adsr_bits & HR_NATN) break; } - if (i =3D=3D HZ) { - pr_err("nec7210: error waiting for NATN\n"); + if (i =3D=3D HZ) return -ETIMEDOUT; - } } =20 clear_bit(COMMAND_READY_BN, &priv->state); @@ -430,17 +429,14 @@ int nec7210_command(gpib_board_t *board, struct nec72= 10_priv *priv, uint8_t test_bit(COMMAND_READY_BN, &priv->state) || test_bit(BUS_ERROR_BN, &priv->state) || test_bit(TIMO_NUM, &board->status))) { - dev_dbg(board->gpib_dev, "gpib command wait interrupted\n"); + dev_dbg(board->gpib_dev, "command wait interrupted\n"); retval =3D -ERESTARTSYS; break; } if (test_bit(TIMO_NUM, &board->status)) break; - if (test_and_clear_bit(BUS_ERROR_BN, &priv->state)) { - pr_err("nec7210: bus error on command byte\n"); + if (test_and_clear_bit(BUS_ERROR_BN, &priv->state)) break; - } - spin_lock_irqsave(&board->spinlock, flags); clear_bit(COMMAND_READY_BN, &priv->state); write_byte(priv, buffer[*bytes_written], CDOR); @@ -454,18 +450,14 @@ int nec7210_command(gpib_board_t *board, struct nec72= 10_priv *priv, uint8_t // wait for last byte to get sent if (wait_event_interruptible(board->wait, test_bit(COMMAND_READY_BN, &pri= v->state) || test_bit(BUS_ERROR_BN, &priv->state) || - test_bit(TIMO_NUM, &board->status))) { - dev_dbg(board->gpib_dev, "gpib command wait interrupted\n"); + test_bit(TIMO_NUM, &board->status))) retval =3D -ERESTARTSYS; - } - if (test_bit(TIMO_NUM, &board->status)) { - dev_dbg(board->gpib_dev, "gpib command timed out\n"); + + if (test_bit(TIMO_NUM, &board->status)) retval =3D -ETIMEDOUT; - } - if (test_and_clear_bit(BUS_ERROR_BN, &priv->state)) { - pr_err("nec7210: bus error on command byte\n"); + + if (test_and_clear_bit(BUS_ERROR_BN, &priv->state)) retval =3D -EIO; - } =20 return retval; } @@ -484,7 +476,6 @@ 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))) { - dev_dbg(board->gpib_dev, "nec7210: pio read wait interrupted\n"); retval =3D -ERESTARTSYS; break; } @@ -503,12 +494,10 @@ static int pio_read(gpib_board_t *board, struct nec72= 10_priv *priv, uint8_t *buf break; } if (test_bit(TIMO_NUM, &board->status)) { - dev_dbg(board->gpib_dev, "interrupted by timeout\n"); retval =3D -ETIMEDOUT; break; } if (test_bit(DEV_CLEAR_BN, &priv->state)) { - dev_dbg(board->gpib_dev, "interrupted by device clear\n"); retval =3D -EINTR; break; } @@ -557,10 +546,9 @@ static ssize_t __dma_read(gpib_board_t *board, struct = nec7210_priv *priv, size_t if (wait_event_interruptible(board->wait, test_bit(DMA_READ_IN_PROGRESS_BN, &priv->state) =3D=3D 0 || test_bit(DEV_CLEAR_BN, &priv->state) || - test_bit(TIMO_NUM, &board->status))) { - dev_dbg(board->gpib_dev, "nec7210: dma read wait interrupted\n"); + test_bit(TIMO_NUM, &board->status))) retval =3D -ERESTARTSYS; - } + if (test_bit(TIMO_NUM, &board->status)) retval =3D -ETIMEDOUT; if (test_bit(DEV_CLEAR_BN, &priv->state)) @@ -638,22 +626,18 @@ static int pio_write_wait(gpib_board_t *board, struct= nec7210_priv *priv, (wake_on_bus_error && test_bit(BUS_ERROR_BN, &priv->state)) || (wake_on_lacs && test_bit(LACS_NUM, &board->status)) || (wake_on_atn && test_bit(ATN_NUM, &board->status)) || - test_bit(TIMO_NUM, &board->status))) { - dev_dbg(board->gpib_dev, "gpib write interrupted\n"); + test_bit(TIMO_NUM, &board->status))) return -ERESTARTSYS; - } - if (test_bit(TIMO_NUM, &board->status)) { - dev_dbg(board->gpib_dev, "nec7210: write timed out\n"); + + if (test_bit(TIMO_NUM, &board->status)) return -ETIMEDOUT; - } - if (test_bit(DEV_CLEAR_BN, &priv->state)) { - dev_dbg(board->gpib_dev, "nec7210: write interrupted by clear\n"); + + if (test_bit(DEV_CLEAR_BN, &priv->state)) return -EINTR; - } - if (wake_on_bus_error && test_and_clear_bit(BUS_ERROR_BN, &priv->state)) { - dev_dbg(board->gpib_dev, "nec7210: bus error on write\n"); + + if (wake_on_bus_error && test_and_clear_bit(BUS_ERROR_BN, &priv->state)) return -EIO; - } + return 0; } =20 @@ -677,7 +661,6 @@ static int pio_write(gpib_board_t *board, struct nec721= 0_priv *priv, uint8_t *bu if (retval =3D=3D -EIO) { /* resend last byte on bus error */ *bytes_written =3D last_count; - dev_dbg(board->gpib_dev, "resending %c\n", buffer[*bytes_written]); /* we can get unrecoverable bus errors, * so give up after a while */ @@ -733,10 +716,9 @@ static ssize_t __dma_write(gpib_board_t *board, struct= nec7210_priv *priv, dma_a test_bit(DMA_WRITE_IN_PROGRESS_BN, &priv->state) =3D=3D 0 || test_bit(BUS_ERROR_BN, &priv->state) || test_bit(DEV_CLEAR_BN, &priv->state) || - test_bit(TIMO_NUM, &board->status))) { - dev_dbg(board->gpib_dev, "gpib write interrupted!\n"); + test_bit(TIMO_NUM, &board->status))) retval =3D -ERESTARTSYS; - } + if (test_bit(TIMO_NUM, &board->status)) retval =3D -ETIMEDOUT; if (test_and_clear_bit(DEV_CLEAR_BN, &priv->state)) @@ -937,13 +919,8 @@ irqreturn_t nec7210_interrupt_have_status(gpib_board_t= *board, set_bit(COMMAND_READY_BN, &priv->state); =20 // command pass through received - if (status1 & HR_CPT) { - unsigned int command; - - command =3D read_byte(priv, CPTR) & gpib_command_mask; + if (status1 & HR_CPT) write_byte(priv, AUX_NVAL, AUXMR); -// printk("gpib: command pass through 0x%x\n", command); - } =20 if (status1 & HR_ERR) set_bit(BUS_ERROR_BN, &priv->state); --=20 2.48.1 From nobody Thu Mar 13 08:35:05 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 From nobody Thu Mar 13 08:35:05 2025 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (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 B9857265CD1 for ; Fri, 14 Feb 2025 11:47:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739533676; cv=none; b=VaeyvXIAJT+TWOLiwlnKpuaqsvzfHGjPW17aAbwydy52WCXvBJpxofxP6QLDy/mhWnLftq7Gd+qzJk8p0NNxgHvOof5UlWHl+RPb0H+2th0sqPCXLOThIhJ8jHTx9TDmyrjlH+mwCUK5fHYK84KO3mdwy+TgclbX0QmEG4JRiBI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739533676; c=relaxed/simple; bh=aVgUx88kEl7lJykIBQ151ja7csomMZwy9qb3bZX2VWc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tU8rJXaF+ELurJLoR/SWrDeLVV5Tv9rsPAB4gDDbA89quggYaixfkz77BpeTUaPKjvzJArnZzqkAq9z0XVlrEQSM8qPrs4n26Jd8LBCZi2qoBT9p0E3Vmnc0Jlhi6cl9s/XnEUloPfhH3eEpZF8GHmloSQrGYh6lP0H7jzk94nQ= 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=KZTa1fSZ; arc=none smtp.client-ip=209.85.128.49 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="KZTa1fSZ" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-4393dc02b78so13324035e9.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=JV/wHIcyPiJMDVxZsFhDgKvFfe1nNbR9A63exHbBC8Y=; b=KZTa1fSZ8i2dWULizmm6rSUf598jm7wfcIA5TWClp3xWMsC4i2aItC5gTz4I7P+/6t z1z5zpWFRkarQ0dPHLrDYayVBo+x/je/P43Pt3yJ6EwlGCg15AbHQCpBA844/rQ5ljhO QLVNVdeX60dMpUyCOfgatYo8UmEl0VUnA6leeFXn/WPMFPcysnMFqr9FaXQ/Xm43E1Xz aGom+SCHm1F4g42MwmYNuNSashIwk9plquJ1ZYQlWBC2VLuarP718PezrZKHF/0SVWHl lD6OuZqWKTP+I1JpX+Iq+XE/Gp0dQ58lCrvwKZNPVSWVnVWlq5zwn2o4LlonkUSSfziC l0QA== 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=JV/wHIcyPiJMDVxZsFhDgKvFfe1nNbR9A63exHbBC8Y=; b=pXfthqGYRp9qSO8rRe6AKr1YR7inoKDQTYM/Jb6jYxLa0b9nvsz2SyRrFsnkmiBDLG l1Z0q1/3HqGUsvtH3FjVwpJUnYLJUKI8RqOiO1Wvh1vMW5eBTiciBlxi8v6qP9mw4Y4r NDleQv4LP2JHz/BUIC7iWoa1Y/PJVqMW1Z0Y2OUBhexm/Rkzj16b5Ms8L+opS2hC2hle TgOwoZg7H+8Ut9YrVyHYT6RvxhGT8VszAr/OUdTf2UWKluEN/Dj3ttxl0k275qSoYdAS fxrtQOckLL/p+462wLsKFtdLhtsd13Is8/pzRWXS0JUIr9z50WjqS+mWkJ8jCXwMOInk +q6A== X-Forwarded-Encrypted: i=1; AJvYcCV21ImrIRSvGUdjVzBdxw7BWXviU1rmP/49pxnwMCKp668jm+P7BDJwkEh9isifXKAcxT22Rp6YqAWargU=@vger.kernel.org X-Gm-Message-State: AOJu0YwQz4mdYETh/Eg6OgJYol4g5SAhkZx9netqWuSpLm6QcrXPhCTZ gGDaaXNmZKR+L6daMixdpykKklLTBM0kU+Z4sKejq/D2O/kU4iLq X-Gm-Gg: ASbGncvaEhbFTeBKHXiSZ7LQK/jtDu52jPGfGM//zCLoLxAOM2NMu/JdoRmt0J05eu6 2Ay5zPTSWtqSuYuFv2clRaeqaDtzJMHWnkKMeIJ2KtRYxpmeX58aD2Qms5TIJTjmRKEj0kdyDvJ XdCmVuILm46xP0dFAOKP+T78fn9wJkl0n/FDpgM5ebBLjeBP02AgiqCk3TPBXfIOEhJLQA58iwf 0D2zZoIFp3gYQSI6Y1wlKUSItm/FJIJRWhwz8PQJXE+atl6Wggfxb9tq+DPt1f8IhA93eBfyb9E RFVDBvm1RdWJY0ATw7gXcdRqpPQcF7GLiT1rj5d8inZmnbEPaJ8= X-Google-Smtp-Source: AGHT+IFJz7z4il1DFNeT4rPu0PDh1kHLOWbD2DZnmKMPGgAexEJbFEFDsP1t2ZmaaGzmCBim1WVMTg== X-Received: by 2002:a05:600c:5492:b0:439:45e2:897f with SMTP id 5b1f17b1804b1-43959a39e2amr150237205e9.11.1739533672855; Fri, 14 Feb 2025 03:47:52 -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.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Feb 2025 03:47:52 -0800 (PST) From: Dave Penkler To: gregkh@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Dave Penkler Subject: [PATCH 15/17] staging: gpib: pc2 console messaging cleanup Date: Fri, 14 Feb 2025 12:47:06 +0100 Message-ID: <20250214114708.28947-16-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 Turn long pr_err into comment, short message in dev_err. Change pr_err to dev_err where possible. Use error return codes consistent with messages. Signed-off-by: Dave Penkler --- drivers/staging/gpib/pc2/pc2_gpib.c | 51 ++++++++++++++++------------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/drivers/staging/gpib/pc2/pc2_gpib.c b/drivers/staging/gpib/pc2= /pc2_gpib.c index 3eccd4c54afa..6711851301ec 100644 --- a/drivers/staging/gpib/pc2/pc2_gpib.c +++ b/drivers/staging/gpib/pc2/pc2_gpib.c @@ -4,6 +4,9 @@ * copyright : (C) 2001, 2002 by Frank Mori Hess *************************************************************************= **/ =20 +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#define dev_fmt pr_fmt + #include #include #include @@ -268,7 +271,8 @@ static int pc2_generic_attach(gpib_board_t *board, cons= t gpib_board_config_t *co * is adapted to use isa_register_driver. */ if (config->ibdma) - pr_err("DMA disabled for pc2 gpib, driver needs to be adapted to use isa= _register_driver to get a struct device*"); + // driver needs to be adapted to use isa_register_driver to get a struct = device* + dev_err(board->gpib_dev, "DMA disabled for pc2 gpib"); #else if (config->ibdma) { nec_priv->dma_buffer_length =3D 0x1000; @@ -280,7 +284,7 @@ static int pc2_generic_attach(gpib_board_t *board, cons= t gpib_board_config_t *co =20 // request isa dma channel if (request_dma(config->ibdma, "pc2")) { - pr_err("gpib: can't request DMA %d\n", config->ibdma); + dev_err(board->gpib_dev, "can't request DMA %d\n", config->ibdma); return -1; } nec_priv->dma_channel =3D config->ibdma; @@ -306,8 +310,8 @@ static int pc2_attach(gpib_board_t *board, const gpib_b= oard_config_t *config) nec_priv->offset =3D pc2_reg_offset; =20 if (!request_region(config->ibbase, pc2_iosize, "pc2")) { - pr_err("gpib: ioports are already in use\n"); - return -1; + dev_err(board->gpib_dev, "ioports are already in use\n"); + return -EBUSY; } nec_priv->iobase =3D config->ibbase; =20 @@ -316,14 +320,14 @@ static int pc2_attach(gpib_board_t *board, const gpib= _board_config_t *config) // install interrupt handler if (config->ibirq) { if (request_irq(config->ibirq, pc2_interrupt, isr_flags, "pc2", board)) { - pr_err("gpib: can't request IRQ %d\n", config->ibirq); - return -1; + dev_err(board->gpib_dev, "can't request IRQ %d\n", config->ibirq); + return -EBUSY; } } pc2_priv->irq =3D config->ibirq; /* poll so we can detect assertion of ATN */ if (gpib_request_pseudo_irq(board, pc2_interrupt)) { - pr_err("pc2_gpib: failed to allocate pseudo_irq\n"); + dev_err(board->gpib_dev, "failed to allocate pseudo_irq\n"); return -1; } /* set internal counter register for 8 MHz input clock */ @@ -384,18 +388,19 @@ static int pc2a_common_attach(gpib_board_t *board, co= nst gpib_board_config_t *co case 0x62e1: break; default: - pr_err("PCIIa base range invalid, must be one of 0x[0246]2e1, but is 0x%= x\n", - config->ibbase); + dev_err(board->gpib_dev, "PCIIa base range invalid, must be one of 0x[02= 46]2e1, but is 0x%x\n", + config->ibbase); return -1; } =20 if (config->ibirq) { if (config->ibirq < 2 || config->ibirq > 7) { - pr_err("pc2_gpib: illegal interrupt level %i\n", config->ibirq); + dev_err(board->gpib_dev, "illegal interrupt level %i\n", + config->ibirq); return -1; } } else { - pr_err("pc2_gpib: interrupt disabled, using polling mode (slow)\n"); + dev_err(board->gpib_dev, "interrupt disabled, using polling mode (slow)\= n"); } #ifdef CHECK_IOPORTS unsigned int err =3D 0; @@ -407,36 +412,36 @@ static int pc2a_common_attach(gpib_board_t *board, co= nst gpib_board_config_t *co if (config->ibirq && check_region(pc2a_clear_intr_iobase + config->ibirq,= 1)) err++; if (err) { - pr_err("gpib: ioports are already in use"); - return -1; + dev_err(board->gpib_dev, "ioports are already in use"); + return -EBUSY; } #endif for (i =3D 0; i < num_registers; i++) { if (!request_region(config->ibbase + i * pc2a_reg_offset, 1, "pc2a")) { - pr_err("gpib: ioports are already in use"); + dev_err(board->gpib_dev, "ioports are already in use"); for (j =3D 0; j < i; j++) release_region(config->ibbase + j * pc2a_reg_offset, 1); - return -1; + return -EBUSY; } } nec_priv->iobase =3D config->ibbase; if (config->ibirq) { if (!request_region(pc2a_clear_intr_iobase + config->ibirq, 1, "pc2a")) = { - pr_err("gpib: ioports are already in use"); + dev_err(board->gpib_dev, "ioports are already in use"); return -1; } pc2_priv->clear_intr_addr =3D pc2a_clear_intr_iobase + config->ibirq; if (request_irq(config->ibirq, pc2a_interrupt, 0, "pc2a", board)) { - pr_err("gpib: can't request IRQ %d\n", config->ibirq); - return -1; + dev_err(board->gpib_dev, "can't request IRQ %d\n", config->ibirq); + return -EBUSY; } } pc2_priv->irq =3D config->ibirq; /* poll so we can detect assertion of ATN */ if (gpib_request_pseudo_irq(board, pc2_interrupt)) { - pr_err("pc2_gpib: failed to allocate pseudo_irq\n"); + dev_err(board->gpib_dev, "failed to allocate pseudo_irq\n"); return -1; } =20 @@ -630,25 +635,25 @@ static int __init pc2_init_module(void) =20 ret =3D gpib_register_driver(&pc2_interface, THIS_MODULE); if (ret) { - pr_err("pc2_gpib: gpib_register_driver failed: error =3D %d\n", ret); + pr_err("gpib_register_driver failed: error =3D %d\n", ret); return ret; } =20 ret =3D gpib_register_driver(&pc2a_interface, THIS_MODULE); if (ret) { - pr_err("pc2_gpib: gpib_register_driver failed: error =3D %d\n", ret); + pr_err("gpib_register_driver failed: error =3D %d\n", ret); goto err_pc2a; } =20 ret =3D gpib_register_driver(&pc2a_cb7210_interface, THIS_MODULE); if (ret) { - pr_err("pc2_gpib: gpib_register_driver failed: error =3D %d\n", ret); + pr_err("gpib_register_driver failed: error =3D %d\n", ret); goto err_cb7210; } =20 ret =3D gpib_register_driver(&pc2_2a_interface, THIS_MODULE); if (ret) { - pr_err("pc2_gpib: gpib_register_driver failed: error =3D %d\n", ret); + pr_err("gpib_register_driver failed: error =3D %d\n", ret); goto err_pc2_2a; } =20 --=20 2.48.1 From nobody Thu Mar 13 08:35:05 2025 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (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 D38AA263C7D for ; Fri, 14 Feb 2025 11:47:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739533678; cv=none; b=ut0eypwgR2YzRJq/gE/bP/Z5ugliB4+vtWSxasZJur7c+p5ePo463ZK4x+YslgNtRdplaKBLswO9omxLdS0uQWNy84PteYXdQmNdQbUG4g6GHq3aIuAMyskwud0Z9xEdwkklIaRlaIp9cjwnOfS1MYB4/6ijpSmoy3uiACC630E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739533678; c=relaxed/simple; bh=ZPsxNDdLxN/WEv2Kchtqn9tK2nC5fl4GJweyGM1bGwk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cKZbtha+nTYyIlMOwB3Y4j2mpNkpTxquaSpHnw3MIL+Ngon7gWZL7Ad5TB1co3JLeFDknGqqutcTkRY7rJP2OtEtZTh8iYKdkB7ouXXZPPRZtegs6WOD4JgEkFAWdK7sXzbQ4+4U84aaPauuZv027MwZtCHJHO2pu23EbDdc4N0= 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=LgClqt0O; arc=none smtp.client-ip=209.85.128.45 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="LgClqt0O" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-4396a4d5e3bso3486005e9.3 for ; Fri, 14 Feb 2025 03:47:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739533674; x=1740138474; 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=Ec71cd/p1hU2cNYNpB/ZLydfzU3d5LhvXmsLFtr772Q=; b=LgClqt0OZyG1HX2dhPM7iZ2KwbkByvJ2es9U04UvcqXTUn1JcQKoIiBmyglYqknwJN imM/LScyNqFuKlbYeLyAF1FG/Ps+YYzQX9W3pOffBRcuT6VGtpMC/q1cmZ51ocSWGOlF zhl4KPiwrrmbSQ9OcpqbFu+/Ee7AtJtkv67z4RGNz4hjHpUZ5inu3qFtA7NfeSFqb6lC gGjoQjn3k7ojDKYvPbdBwwNb4Kpmf5Twashq8vs11bR7hZLAenwxsJJdhYyGfX5umpkF b3FeGRCUPrhSu+HVbkTp21Q2YLnLtaif0Tf/JfxydIpOuXyaRN2e/CPAHHu8Qw1Z2+yu /7/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739533674; x=1740138474; 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=Ec71cd/p1hU2cNYNpB/ZLydfzU3d5LhvXmsLFtr772Q=; b=BUXHA/aUtVWFSyFbBAEwFTYanfI290WsplLGs8UVi8RuSo8V+ky4fovNgHN0bByDU8 0A045XyA99bAWeIAT0q6t31QvfoDdkuuaoscZIrRgNGXKCZP6RXVPlpUmqrMNLxc1shn sfZkI9U9YMy+Ymm/E18xxIVFJHB7/RUEMV/hI23f51k5tWVJAQ9wZ3KFdLVn9aOPyTbG wk8UMkghhkGLXfYTeq80PePFUHX8aMwA647qLfE4zCv8LFjBCrYCWTWKf3TDLRavA8AA qmtP1kHxypqAoSRn4jRpoYZ2jRXiVJcE+G5M3bioTvTMAm2Vtm40Iz7fAFVdNf/0lDsF 2fOw== X-Forwarded-Encrypted: i=1; AJvYcCU7OnZb/yB3hc8O+GeNlcyz0WgHWoMCaKl4pscxLMAt0UeXV4DBelKzA8ArnnmgC6Qfw3+BpZ7DelX1tM8=@vger.kernel.org X-Gm-Message-State: AOJu0Yyet5LPr4aE4krJIQN0VY81pk9Zzu8LlWHjaePde6lpZ4RI0sGa Q2Fr2BUcrhy62La+Se8iF96Rijypykoj/UOoRRf1wG8pEwoIbAlVMoSG9g== X-Gm-Gg: ASbGncsxFtrQ32exiFK4DuuvtrDaSFuoiTFsKdKkt3v0rsQPU8tZap6ydD+tF+X5FTO DdqBomIbvNbn48J+S7uhGx9XTK3hR3rmYLse1CmybkNMbnOR7ZceLmHCOoFFdYhI5VM9QmfTxJo SkY1uEIs0OO8zOeTiEsVv+7rez67YveSYHNFzRCFBV26vQegX+Q7fJ30TK3sRuakjdOxZCabnh1 PpK8i7eYcICiZJ/uGeUVvi8qNrrUtzpnmOXCi9h6Jw0xFpf1X0jlV2FKk+NohbVRsW3ZvFzLha1 jUU/O0IpcWHiZvuvtFPPDO4TrIqPq9dIKPtVWyFl81omDs82wY0= X-Google-Smtp-Source: AGHT+IGgguSbTbESk+Ov1C1vagzixWuyEOgymSOQurmS8GN7IKNeKOjCL+nOvt0DUJLwkNwpAHQhRw== X-Received: by 2002:a05:600c:511a:b0:439:6b57:c68 with SMTP id 5b1f17b1804b1-4396b570e93mr9299385e9.17.1739533674023; Fri, 14 Feb 2025 03:47:54 -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.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Feb 2025 03:47:53 -0800 (PST) From: Dave Penkler To: gregkh@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Dave Penkler Subject: [PATCH 16/17] staging: gpib: tms9914 console messaging cleanup Date: Fri, 14 Feb 2025 12:47:07 +0100 Message-ID: <20250214114708.28947-17-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 Remove pr_err on go_to_standby timeout. Remove write wait and command wait interrupted messages. Remove __func__ parameter on error messages Change pr_err to dev_err where possible. Remove commented printk Uncomment dev_dbg in interrupt_have status Signed-off-by: Dave Penkler --- drivers/staging/gpib/tms9914/tms9914.c | 33 +++++++++++--------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/drivers/staging/gpib/tms9914/tms9914.c b/drivers/staging/gpib/= tms9914/tms9914.c index ec8e1d4d762f..1f2bb163cfb5 100644 --- a/drivers/staging/gpib/tms9914/tms9914.c +++ b/drivers/staging/gpib/tms9914/tms9914.c @@ -4,6 +4,9 @@ * copyright : (C) 2001, 2002 by Frank Mori Hess *************************************************************************= **/ =20 +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#define dev_fmt pr_fmt + #include #include #include @@ -83,10 +86,8 @@ int tms9914_go_to_standby(gpib_board_t *board, struct tm= s9914_priv *priv) break; udelay(1); } - if (i =3D=3D timeout) { - pr_err("error waiting for NATN\n"); + if (i =3D=3D timeout) return -ETIMEDOUT; - } =20 clear_bit(COMMAND_READY_BN, &priv->state); =20 @@ -175,7 +176,7 @@ void tms9914_set_holdoff_mode(struct tms9914_priv *priv= , enum tms9914_holdoff_mo write_byte(priv, AUX_HLDA | AUX_CS, AUXCR); break; default: - pr_err("%s: bug! bad holdoff mode %i\n", __func__, mode); + pr_err("bug! bad holdoff mode %i\n", mode); break; } priv->holdoff_mode =3D mode; @@ -437,10 +438,9 @@ static int wait_for_read_byte(gpib_board_t *board, str= uct tms9914_priv *priv) if (wait_event_interruptible(board->wait, test_bit(READ_READY_BN, &priv->state) || test_bit(DEV_CLEAR_BN, &priv->state) || - test_bit(TIMO_NUM, &board->status))) { - pr_debug("gpib: pio read wait interrupted\n"); + test_bit(TIMO_NUM, &board->status))) return -ERESTARTSYS; - } + if (test_bit(TIMO_NUM, &board->status)) return -ETIMEDOUT; =20 @@ -472,7 +472,7 @@ static inline uint8_t tms9914_read_data_in(gpib_board_t= *board, struct tms9914_p case TMS9914_HOLDOFF_NONE: break; default: - pr_err("%s: bug! bad holdoff mode %i\n", __func__, priv->holdoff_mode); + dev_err(board->gpib_dev, "bug! bad holdoff mode %i\n", priv->holdoff_mod= e); break; } spin_unlock_irqrestore(&board->spinlock, flags); @@ -548,10 +548,9 @@ static int pio_write_wait(gpib_board_t *board, struct = tms9914_priv *priv) test_bit(WRITE_READY_BN, &priv->state) || test_bit(BUS_ERROR_BN, &priv->state) || test_bit(DEV_CLEAR_BN, &priv->state) || - test_bit(TIMO_NUM, &board->status))) { - dev_dbg(board->gpib_dev, "gpib write interrupted!\n"); + test_bit(TIMO_NUM, &board->status))) return -ERESTARTSYS; - } + if (test_bit(TIMO_NUM, &board->status)) return -ETIMEDOUT; if (test_bit(BUS_ERROR_BN, &priv->state)) @@ -667,10 +666,8 @@ int tms9914_command(gpib_board_t *board, struct tms991= 4_priv *priv, uint8_t *bu if (wait_event_interruptible(board->wait, test_bit(COMMAND_READY_BN, &priv->state) || - test_bit(TIMO_NUM, &board->status))) { - pr_debug("gpib command wait interrupted\n"); + test_bit(TIMO_NUM, &board->status))) break; - } if (test_bit(TIMO_NUM, &board->status)) break; =20 @@ -761,8 +758,6 @@ irqreturn_t tms9914_interrupt_have_status(gpib_board_t = *board, struct tms9914_pr write_byte(priv, AUX_INVAL, AUXCR); } } else { - // printk("tms9914: unrecognized gpib command pass thru 0x%x\n", - // command_byte); // clear dac holdoff write_byte(priv, AUX_INVAL, AUXCR); } @@ -799,7 +794,7 @@ irqreturn_t tms9914_interrupt_have_status(gpib_board_t = *board, struct tms9914_pr // check for being addressed with secondary addressing if (status1 & HR_APT) { if (board->sad < 0) - pr_err("tms9914: bug, APT interrupt without secondary addressing?\n"); + dev_err(board->gpib_dev, "bug, APT interrupt without secondary addressi= ng?\n"); if ((read_byte(priv, CPTR) & gpib_command_mask) =3D=3D MSA(board->sad)) write_byte(priv, AUX_VAL, AUXCR); else @@ -807,8 +802,8 @@ irqreturn_t tms9914_interrupt_have_status(gpib_board_t = *board, struct tms9914_pr } =20 if ((status0 & priv->imr0_bits) || (status1 & priv->imr1_bits)) { -// 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); + 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); } --=20 2.48.1 From nobody Thu Mar 13 08:35:05 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 52ED6266566 for ; Fri, 14 Feb 2025 11:47:57 +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=s4d5GdmiX4qhqrsz6WoiVLTMvuf1H9UEGC8XQixIXtkyfrmEzfcd7OYPErcLNcj0pSY7FUUkDm1x0p2o5gTaL83Y2ZstP0Z+ZNNLu2EE2dGYOcgrM+KKflQPvcebnnLAu+DBcqEjf92/KNGQczzB6KhdTkd2lPnF0mn5wtOFvX8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739533680; c=relaxed/simple; bh=oJGclg8ugMOnXh+x9a8uPraI1Lb09cPGaGm5NxC8nsU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=r68yieLmeOKrPzoBdL9KhtCuDapOql36/onTt3/u4ItHPkDe/uvhGgZ3i5gHlEAnGAtobkEmfOco91p1umkkq36+ewsLsVWjn8uWlDVQdOLuZ+AuA/UuyfboOwm8nMRr3EQaafwd8UG3bYNj44VP3U62RNQZ2ETMqQKsyEAeyKc= 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=Nh3FVwl8; 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="Nh3FVwl8" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-43948021a45so20426085e9.1 for ; Fri, 14 Feb 2025 03:47:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739533675; x=1740138475; 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=oK5RzhnItMDSuwsYxfF6Zub/vglMr5j5JrlwDlBoEUY=; b=Nh3FVwl8upEDdf0EBr1uDO4sfoykeRBvVn4djBluplpQz+EYoZhYI4ztNpuqMcNHWH 31VlFObHNhoyDTuwdqp4Ud/+c+Lf59MalaWyFAfPSszTjwafsnPsW4Vbwr/cx1bB+UHB 2/8RB4WhKm4EVua5dwwboMR+fSxpj5JXc4zT8XCOfuQ2Mlft2aJyyOEtT7iGCry+53Go CS3ZDVW717KJ81QErbPtNCKfCnFZPyoBDJDha7YQYftHyVG4X2XQgQCKVj9AqTFhzwEf q95fewYab78ttrBmDrN6or2acXQ8M+f3wdEXGb8BOPKY+bXGexSYbggOBplvnBexilad f0cA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739533675; x=1740138475; 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=oK5RzhnItMDSuwsYxfF6Zub/vglMr5j5JrlwDlBoEUY=; b=G9ud8mAFoq6rskmLEJ/VAl7tBzj0Qn85L0pIuQnE2opT8vMSrzAV2eavjkNSMRai+S abd2N+Yi7cO6U7hzXs/9A9XH2qafw8eZMTwNdoMrxp60uSbEwNhDX36bWPMbQSQ6MJXH cVFoLqoExpZl8i9A+M6BrCF+LgDNv80T4JO0tOGgvkZmWv8NOi5fGwDyHv4uDvnBygWI QSmKvOI+ke8eRlPHlxAdfT7BfkROaJPrTh3jrEcGWoXa5VZhDNEhx9Am6pHSGkug1CHw UIg5+qevyyReOcwTCZg1FCnWr6vQOFF0mGBScb8wTud7DwUf3tH/pqQgxUCNwlVaZTYz 6bsA== X-Forwarded-Encrypted: i=1; AJvYcCV3WxQJ2jMzCt8fLyJXcV3ebXV2xRK8zTZAk9Vdly1lD+vzU+YXED4OgRQSDfibIvWVnYWqUSkCD/01wac=@vger.kernel.org X-Gm-Message-State: AOJu0Yzcs0EByfmV+/G1MKjcE5sCWUYr1dMjRDpgq9ZnehGNUnvWRzJY a4Pejw87iEhHacZA/NGSlFpTkul331JNUntwY0AkaM14bhAWJILD X-Gm-Gg: ASbGncvuh06uxQARzhZUqdbKShkQHOmTlcJ/rEHLVT9PQ50PkJRV0mx1PGuRo1uuHrH b7KDxM9lkOUwrxZESWEC1eLlKJm77nzV+YCu5KXPiOOtf/E3SOSHPuepGqNucnPnAHnCZjojN7y fqIByIydNEk5TCMAwkB4TCu3WAt7Lu/QfJEhViaZMqvY6Mmow8Vo2Z4aKS4jAlr8FNQUP9er9b5 178BVDvN1/sXgGRpcDMfelslxnysur2Zo3b2E7xBUg3bOW8bTDXxYOKmeMxpmTdqCzIMu01/KLq +ZsucCgud+/+xp1DfDNvyO8mD1TV2J/mXNwCQEEF5AiDsNCxihM= X-Google-Smtp-Source: AGHT+IE1RZfnfDyeSpQ4oYcSV3M6SzBMvzBo5o/MmZUePTsqZgGVaMhg9UcGlN6oECAbkStOw5OTwQ== X-Received: by 2002:a05:600c:5487:b0:438:a240:c63 with SMTP id 5b1f17b1804b1-43958157c4bmr120391945e9.2.1739533675269; Fri, 14 Feb 2025 03:47:55 -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.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Feb 2025 03:47:54 -0800 (PST) From: Dave Penkler To: gregkh@linuxfoundation.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Cc: Dave Penkler Subject: [PATCH 17/17] staging: gpib: tnt4882 console messaging cleanup Date: Fri, 14 Feb 2025 12:47:08 +0100 Message-ID: <20250214114708.28947-18-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 "tnt4882_gpib" in pci_driver struct, request_region and request_irq. Remove unsupported chipset pr_err's Remove messages on interrupted or timed out reads and writes. Remove board not found messages and return -ENODEV Remove "tnt4882:" prefix in messages as it will be printed by pr_fmt and dev_fmt. Change pr_err to dev_err where possible. Remove irq and chipset pr_info's. Replace error messages with appropriate error returns. Remove call to mite_list_devices() and the function in mite.c Remove PCMCIA debug comments, PCMCIA_DEBUG conditional compilation symbol, the DEBUG macro definition and its uses. Remove pr_info's in mite.c Signed-off-by: Dave Penkler --- drivers/staging/gpib/tnt4882/mite.c | 17 -- drivers/staging/gpib/tnt4882/tnt4882_gpib.c | 186 +++++++------------- 2 files changed, 60 insertions(+), 143 deletions(-) diff --git a/drivers/staging/gpib/tnt4882/mite.c b/drivers/staging/gpib/tnt= 4882/mite.c index ea64dde46bcb..847b96f411bd 100644 --- a/drivers/staging/gpib/tnt4882/mite.c +++ b/drivers/staging/gpib/tnt4882/mite.c @@ -88,7 +88,6 @@ int mite_setup(struct mite_struct *mite) pr_err("mite: failed to remap mite io memory address.\n"); return -ENOMEM; } - pr_info("mite: 0x%08lx mapped to %p\n", mite->mite_phys_addr, mite->mite_= io_addr); addr =3D pci_resource_start(mite->pcidev, 1); mite->daq_phys_addr =3D addr; mite->daq_io_addr =3D ioremap(mite->daq_phys_addr, pci_resource_len(mite-= >pcidev, 1)); @@ -96,7 +95,6 @@ int mite_setup(struct mite_struct *mite) pr_err("mite: failed to remap daq io memory address.\n"); return -ENOMEM; } - pr_info("mite: daq: 0x%08lx mapped to %p\n", mite->daq_phys_addr, mite->d= aq_io_addr); writel(mite->daq_phys_addr | WENAB, mite->mite_io_addr + MITE_IODWBSR); mite->used =3D 1; return 0; @@ -133,18 +131,3 @@ void mite_unsetup(struct mite_struct *mite) } mite->used =3D 0; } - -void mite_list_devices(void) -{ - struct mite_struct *mite, *next; - - pr_info("Available NI PCI device IDs:"); - if (mite_devices) - for (mite =3D mite_devices; mite; mite =3D next) { - next =3D mite->next; - pr_info(" 0x%04x", mite_device_id(mite)); - if (mite->used) - pr_info("(used)"); - } - pr_info("\n"); -} diff --git a/drivers/staging/gpib/tnt4882/tnt4882_gpib.c b/drivers/staging/= gpib/tnt4882/tnt4882_gpib.c index 3118fe7613f6..aadff5b2c4de 100644 --- a/drivers/staging/gpib/tnt4882/tnt4882_gpib.c +++ b/drivers/staging/gpib/tnt4882/tnt4882_gpib.c @@ -5,6 +5,10 @@ * copyright : (C) 2001, 2002 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 @@ -97,7 +101,6 @@ static inline unsigned short tnt_readb(struct tnt4882_pr= iv *priv, unsigned long retval =3D 0; break; default: - pr_err("tnt4882: bug! unsupported ni_chipset\n"); retval =3D 0; break; } @@ -132,7 +135,6 @@ static inline void tnt_writeb(struct tnt4882_priv *priv= , unsigned short value, u case NEC7210: break; default: - pr_err("tnt4882: bug! unsupported ni_chipset\n"); break; } break; @@ -326,22 +328,18 @@ static int tnt4882_accel_read(gpib_board_t *board, ui= nt8_t *buffer, size_t lengt test_bit(DEV_CLEAR_BN, &nec_priv->state) || test_bit(ADR_CHANGE_BN, &nec_priv->state) || test_bit(TIMO_NUM, &board->status))) { - pr_err("tnt4882: read interrupted\n"); retval =3D -ERESTARTSYS; break; } if (test_bit(TIMO_NUM, &board->status)) { - //pr_info("tnt4882: minor %i read timed out\n", board->minor); retval =3D -ETIMEDOUT; break; } if (test_bit(DEV_CLEAR_BN, &nec_priv->state)) { - pr_err("tnt4882: device clear interrupted read\n"); retval =3D -EINTR; break; } if (test_bit(ADR_CHANGE_BN, &nec_priv->state)) { - pr_err("tnt4882: address change interrupted read\n"); retval =3D -EINTR; break; } @@ -368,20 +366,14 @@ static int tnt4882_accel_read(gpib_board_t *board, ui= nt8_t *buffer, size_t lengt test_bit(DEV_CLEAR_BN, &nec_priv->state) || test_bit(ADR_CHANGE_BN, &nec_priv->state) || test_bit(TIMO_NUM, &board->status))) { - pr_err("tnt4882: read interrupted\n"); retval =3D -ERESTARTSYS; } if (test_bit(TIMO_NUM, &board->status)) - //pr_info("tnt4882: read timed out\n"); retval =3D -ETIMEDOUT; - if (test_bit(DEV_CLEAR_BN, &nec_priv->state)) { - pr_err("tnt4882: device clear interrupted read\n"); + if (test_bit(DEV_CLEAR_BN, &nec_priv->state)) retval =3D -EINTR; - } - if (test_bit(ADR_CHANGE_BN, &nec_priv->state)) { - pr_err("tnt4882: address change interrupted read\n"); + if (test_bit(ADR_CHANGE_BN, &nec_priv->state)) retval =3D -EINTR; - } count +=3D drain_fifo_words(tnt_priv, &buffer[count], length - count); if (fifo_byte_available(tnt_priv) && count < length) buffer[count++] =3D tnt_readb(tnt_priv, FIFOB); @@ -444,22 +436,15 @@ static int write_wait(gpib_board_t *board, struct tnt= 4882_priv *tnt_priv, fifo_xfer_done(tnt_priv) || test_bit(BUS_ERROR_BN, &nec_priv->state) || test_bit(DEV_CLEAR_BN, &nec_priv->state) || - test_bit(TIMO_NUM, &board->status))) { - dev_dbg(board->gpib_dev, "gpib write interrupted\n"); + test_bit(TIMO_NUM, &board->status))) return -ERESTARTSYS; - } - if (test_bit(TIMO_NUM, &board->status)) { - pr_info("tnt4882: write timed out\n"); + + if (test_bit(TIMO_NUM, &board->status)) return -ETIMEDOUT; - } - if (test_and_clear_bit(BUS_ERROR_BN, &nec_priv->state)) { - pr_err("tnt4882: write bus error\n"); + if (test_and_clear_bit(BUS_ERROR_BN, &nec_priv->state)) return (send_commands) ? -ENOTCONN : -ECOMM; - } - if (test_bit(DEV_CLEAR_BN, &nec_priv->state)) { - pr_err("tnt4882: device clear interrupted write\n"); + if (test_bit(DEV_CLEAR_BN, &nec_priv->state)) return -EINTR; - } return 0; } =20 @@ -592,7 +577,7 @@ static irqreturn_t tnt4882_internal_interrupt(gpib_boar= d_t *board) if (isr3_bits & HR_DONE) priv->imr3_bits &=3D ~HR_DONE; if (isr3_bits & (HR_INTR | HR_TLCI)) { - dev_dbg(board->gpib_dev, "tnt4882: minor %i isr0 0x%x imr0 0x%x isr3 0x%= x imr3 0x%x\n", + dev_dbg(board->gpib_dev, "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); @@ -933,10 +918,8 @@ static int ni_pci_attach(gpib_board_t *board, const gp= ib_board_config_t *config) nec_priv->write_byte =3D nec7210_locking_iomem_write_byte; nec_priv->offset =3D atgpib_reg_offset; =20 - if (!mite_devices) { - pr_err("no National Instruments PCI boards found\n"); - return -1; - } + if (!mite_devices) + return -ENODEV; =20 for (mite =3D mite_devices; mite; mite =3D mite->next) { short found_board; @@ -967,37 +950,32 @@ static int ni_pci_attach(gpib_board_t *board, const g= pib_board_config_t *config) if (found_board) break; } - if (!mite) { - pr_err("no NI PCI-GPIB boards found\n"); - return -1; - } + if (!mite) + return -ENODEV; + tnt_priv->mite =3D mite; retval =3D mite_setup(tnt_priv->mite); - if (retval < 0) { - pr_err("tnt4882: error setting up mite.\n"); + if (retval < 0) return retval; - } =20 nec_priv->mmiobase =3D tnt_priv->mite->daq_io_addr; =20 // get irq - if (request_irq(mite_irq(tnt_priv->mite), tnt4882_interrupt, isr_flags, - "ni-pci-gpib", board)) { - pr_err("gpib: can't request IRQ %d\n", mite_irq(tnt_priv->mite)); - return -1; + retval =3D request_irq(mite_irq(tnt_priv->mite), tnt4882_interrupt, isr_f= lags, "ni-pci-gpib", + board); + if (retval) { + dev_err(board->gpib_dev, "failed to obtain pci irq %d\n", mite_irq(tnt_p= riv->mite)); + return retval; } tnt_priv->irq =3D mite_irq(tnt_priv->mite); - pr_info("tnt4882: irq %i\n", tnt_priv->irq); =20 // TNT5004 detection switch (tnt_readb(tnt_priv, CSR) & 0xf0) { case 0x30: nec_priv->type =3D TNT4882; - pr_info("tnt4882: TNT4882 chipset detected\n"); break; case 0x40: nec_priv->type =3D TNT5004; - pr_info("tnt4882: TNT5004 chipset detected\n"); break; } tnt4882_init(tnt_priv, board); @@ -1027,23 +1005,17 @@ static int ni_isapnp_find(struct pnp_dev **dev) { *dev =3D pnp_find_dev(NULL, ISAPNP_VENDOR_ID_NI, ISAPNP_FUNCTION(ISAPNP_ID_NI_ATGPIB_TNT), NULL); - if (!*dev || !(*dev)->card) { - pr_err("tnt4882: failed to find isapnp board\n"); + if (!*dev || !(*dev)->card) return -ENODEV; - } - if (pnp_device_attach(*dev) < 0) { - pr_err("tnt4882: atgpib/tnt board already active, skipping\n"); + if (pnp_device_attach(*dev) < 0) return -EBUSY; - } if (pnp_activate_dev(*dev) < 0) { pnp_device_detach(*dev); - pr_err("tnt4882: failed to activate() atgpib/tnt, aborting\n"); return -EAGAIN; } if (!pnp_port_valid(*dev, 0) || !pnp_irq_valid(*dev, 0)) { pnp_device_detach(*dev); - pr_err("tnt4882: invalid port or irq for atgpib/tnt, aborting\n"); - return -ENOMEM; + return -EINVAL; } return 0; } @@ -1056,6 +1028,7 @@ static int ni_isa_attach_common(gpib_board_t *board, = const gpib_board_config_t * int isr_flags =3D 0; u32 iobase; int irq; + int retval; =20 board->status =3D 0; =20 @@ -1071,7 +1044,6 @@ static int ni_isa_attach_common(gpib_board_t *board, = const gpib_board_config_t * // look for plug-n-play board if (config->ibbase =3D=3D 0) { struct pnp_dev *dev; - int retval; =20 retval =3D ni_isapnp_find(&dev); if (retval < 0) @@ -1084,18 +1056,18 @@ static int ni_isa_attach_common(gpib_board_t *board= , const gpib_board_config_t * irq =3D config->ibirq; } // allocate ioports - if (!request_region(iobase, atgpib_iosize, "atgpib")) { - pr_err("tnt4882: failed to allocate ioports\n"); - return -1; - } + if (!request_region(iobase, atgpib_iosize, "atgpib")) + return -EBUSY; + nec_priv->mmiobase =3D ioport_map(iobase, atgpib_iosize); if (!nec_priv->mmiobase) - return -1; + return -EBUSY; =20 // get irq - if (request_irq(irq, tnt4882_interrupt, isr_flags, "atgpib", board)) { - pr_err("gpib: can't request IRQ %d\n", irq); - return -1; + retval =3D request_irq(irq, tnt4882_interrupt, isr_flags, "atgpib", board= ); + if (retval) { + dev_err(board->gpib_dev, "failed to request ISA irq %d\n", irq); + return retval; } tnt_priv->irq =3D irq; =20 @@ -1385,7 +1357,7 @@ static const struct pci_device_id tnt4882_pci_table[]= =3D { MODULE_DEVICE_TABLE(pci, tnt4882_pci_table); =20 static struct pci_driver tnt4882_pci_driver =3D { - .name =3D "tnt4882", + .name =3D DRV_NAME, .id_table =3D tnt4882_pci_table, .probe =3D &tnt4882_pci_probe }; @@ -1409,80 +1381,79 @@ static int __init tnt4882_init_module(void) =20 result =3D pci_register_driver(&tnt4882_pci_driver); if (result) { - pr_err("tnt4882_gpib: pci_register_driver failed: error =3D %d\n", resul= t); + pr_err("pci_register_driver failed: error =3D %d\n", result); return result; } =20 result =3D gpib_register_driver(&ni_isa_interface, THIS_MODULE); if (result) { - pr_err("tnt4882_gpib: gpib_register_driver failed: error =3D %d\n", resu= lt); + pr_err("gpib_register_driver failed: error =3D %d\n", result); goto err_isa; } =20 result =3D gpib_register_driver(&ni_isa_accel_interface, THIS_MODULE); if (result) { - pr_err("tnt4882_gpib: gpib_register_driver failed: error =3D %d\n", resu= lt); + pr_err("gpib_register_driver failed: error =3D %d\n", result); goto err_isa_accel; } =20 result =3D gpib_register_driver(&ni_nat4882_isa_interface, THIS_MODULE); if (result) { - pr_err("tnt4882_gpib: gpib_register_driver failed: error =3D %d\n", resu= lt); + pr_err("gpib_register_driver failed: error =3D %d\n", result); goto err_nat4882_isa; } =20 result =3D gpib_register_driver(&ni_nat4882_isa_accel_interface, THIS_MOD= ULE); if (result) { - pr_err("tnt4882_gpib: gpib_register_driver failed: error =3D %d\n", resu= lt); + pr_err("gpib_register_driver failed: error =3D %d\n", result); goto err_nat4882_isa_accel; } =20 result =3D gpib_register_driver(&ni_nec_isa_interface, THIS_MODULE); if (result) { - pr_err("tnt4882_gpib: gpib_register_driver failed: error =3D %d\n", resu= lt); + pr_err("gpib_register_driver failed: error =3D %d\n", result); goto err_nec_isa; } =20 result =3D gpib_register_driver(&ni_nec_isa_accel_interface, THIS_MODULE); if (result) { - pr_err("tnt4882_gpib: gpib_register_driver failed: error =3D %d\n", resu= lt); + pr_err("gpib_register_driver failed: error =3D %d\n", result); goto err_nec_isa_accel; } =20 result =3D gpib_register_driver(&ni_pci_interface, THIS_MODULE); if (result) { - pr_err("tnt4882_gpib: gpib_register_driver failed: error =3D %d\n", resu= lt); + pr_err("gpib_register_driver failed: error =3D %d\n", result); goto err_pci; } =20 result =3D gpib_register_driver(&ni_pci_accel_interface, THIS_MODULE); if (result) { - pr_err("tnt4882_gpib: gpib_register_driver failed: error =3D %d\n", resu= lt); + pr_err("gpib_register_driver failed: error =3D %d\n", result); goto err_pci_accel; } =20 #ifdef CONFIG_GPIB_PCMCIA result =3D gpib_register_driver(&ni_pcmcia_interface, THIS_MODULE); if (result) { - pr_err("tnt4882_gpib: gpib_register_driver failed: error =3D %d\n", resu= lt); + pr_err("gpib_register_driver failed: error =3D %d\n", result); goto err_pcmcia; } =20 result =3D gpib_register_driver(&ni_pcmcia_accel_interface, THIS_MODULE); if (result) { - pr_err("tnt4882_gpib: gpib_register_driver failed: error =3D %d\n", resu= lt); + pr_err("gpib_register_driver failed: error =3D %d\n", result); goto err_pcmcia_accel; } =20 result =3D init_ni_gpib_cs(); if (result) { - pr_err("tnt4882_gpib: pcmcia_register_driver failed: error =3D %d\n", re= sult); + pr_err("pcmcia_register_driver failed: error =3D %d\n", result); goto err_pcmcia_driver; } #endif =20 mite_init(); - mite_list_devices(); =20 return 0; =20 @@ -1548,25 +1519,6 @@ static void __exit tnt4882_exit_module(void) #include #include =20 -/* - * All the PCMCIA modules use PCMCIA_DEBUG to control debugging. If - * you do not define PCMCIA_DEBUG at all, all the debug code will be - * left out. If you compile with PCMCIA_DEBUG=3D0, the debug code will - * be present but disabled -- but it can then be enabled for specific - * modules at load time with a 'pc_debug=3D#' option to insmod. - */ -#define PCMCIA_DEBUG 1 -#ifdef PCMCIA_DEBUG -static int pc_debug =3D PCMCIA_DEBUG; -module_param(pc_debug, int, 0); -#define DEBUG(n, args...) \ - do {if (pc_debug > (n)) \ - pr_debug(args); } \ - while (0) -#else -#define DEBUG(args...) -#endif - static int ni_gpib_config(struct pcmcia_device *link); static void ni_gpib_release(struct pcmcia_device *link); static void ni_pcmcia_detach(gpib_board_t *board); @@ -1604,8 +1556,6 @@ static int ni_gpib_probe(struct pcmcia_device *link) struct local_info_t *info; //struct gpib_board_t *dev; =20 - DEBUG(0, "%s(0x%p)\n", __func__, link); - /* Allocate space for private device-specific data */ info =3D kzalloc(sizeof(*info), GFP_KERNEL); if (!info) @@ -1639,8 +1589,6 @@ static void ni_gpib_remove(struct pcmcia_device *link) struct local_info_t *info =3D link->priv; //struct gpib_board_t *dev =3D info->dev; =20 - DEBUG(0, "%s(%p)\n", __func__, link); - if (info->dev) ni_pcmcia_detach(info->dev); ni_gpib_release(link); @@ -1671,8 +1619,6 @@ static int ni_gpib_config(struct pcmcia_device *link) //gpib_board_t *dev =3D info->dev; int last_ret; =20 - DEBUG(0, "%s(0x%p)\n", __func__, link); - last_ret =3D pcmcia_loop_config(link, &ni_gpib_config_iteration, NULL); if (last_ret) { dev_warn(&link->dev, "no configuration found\n"); @@ -1695,7 +1641,6 @@ static int ni_gpib_config(struct pcmcia_device *link) */ static void ni_gpib_release(struct pcmcia_device *link) { - DEBUG(0, "%s(0x%p)\n", __func__, link); pcmcia_disable_device(link); } /* ni_gpib_release */ =20 @@ -1703,10 +1648,9 @@ static int ni_gpib_suspend(struct pcmcia_device *lin= k) { //struct local_info_t *info =3D link->priv; //struct gpib_board_t *dev =3D info->dev; - DEBUG(0, "%s(0x%p)\n", __func__, link); =20 if (link->open) - pr_err("Device still open ???\n"); + dev_warn(&link->dev, "Device still open\n"); //netif_device_detach(dev); =20 return 0; @@ -1716,11 +1660,9 @@ static int ni_gpib_resume(struct pcmcia_device *link) { //struct local_info_t *info =3D link->priv; //struct gpib_board_t *dev =3D info->dev; - DEBUG(0, "%s(0x%p)\n", __func__, link); =20 /*if (link->open) { * ni_gpib_probe(dev); / really? - * printk("Gpib resumed ???\n"); * //netif_device_attach(dev); *} */ @@ -1753,7 +1695,6 @@ static int __init init_ni_gpib_cs(void) =20 static void __exit exit_ni_gpib_cs(void) { - DEBUG(0, "ni_gpib_cs: unloading\n"); pcmcia_unregister_driver(&ni_gpib_cs_driver); } =20 @@ -1765,13 +1706,10 @@ static int ni_pcmcia_attach(gpib_board_t *board, co= nst gpib_board_config_t *conf struct tnt4882_priv *tnt_priv; struct nec7210_priv *nec_priv; int isr_flags =3D IRQF_SHARED; + int retval; =20 - DEBUG(0, "%s(0x%p)\n", __func__, board); - - if (!curr_dev) { - pr_err("gpib: no NI PCMCIA board found\n"); - return -1; - } + if (!curr_dev) + return -ENODEV; =20 info =3D curr_dev->priv; info->dev =3D board; @@ -1780,6 +1718,7 @@ static int ni_pcmcia_attach(gpib_board_t *board, cons= t gpib_board_config_t *conf =20 if (tnt4882_allocate_private(board)) return -ENOMEM; + tnt_priv =3D board->private_data; nec_priv =3D &tnt_priv->nec7210_priv; nec_priv->type =3D TNT4882; @@ -1787,23 +1726,20 @@ static int ni_pcmcia_attach(gpib_board_t *board, co= nst gpib_board_config_t *conf nec_priv->write_byte =3D nec7210_locking_ioport_write_byte; nec_priv->offset =3D atgpib_reg_offset; =20 - DEBUG(0, "ioport1 window attributes: 0x%lx\n", curr_dev->resource[0]->fla= gs); if (!request_region(curr_dev->resource[0]->start, resource_size(curr_dev-= >resource[0]), - "tnt4882")) { - pr_err("gpib: ioports starting at 0x%lx are already in use\n", - (unsigned long)curr_dev->resource[0]->start); - return -EIO; - } + DRV_NAME)) + return -ENOMEM; =20 nec_priv->mmiobase =3D ioport_map(curr_dev->resource[0]->start, resource_size(curr_dev->resource[0])); if (!nec_priv->mmiobase) - return -1; + return -ENOMEM; =20 // get irq - if (request_irq(curr_dev->irq, tnt4882_interrupt, isr_flags, "tnt4882", b= oard)) { - pr_err("gpib: can't request IRQ %d\n", curr_dev->irq); - return -1; + retval =3D request_irq(curr_dev->irq, tnt4882_interrupt, isr_flags, DRV_N= AME, board); + if (retval) { + dev_err(board->gpib_dev, "failed to obtain PCMCIA irq %d\n", curr_dev->i= rq); + return retval; } tnt_priv->irq =3D curr_dev->irq; =20 @@ -1817,8 +1753,6 @@ static void ni_pcmcia_detach(gpib_board_t *board) struct tnt4882_priv *tnt_priv =3D board->private_data; struct nec7210_priv *nec_priv; =20 - DEBUG(0, "%s(0x%p)\n", __func__, board); - if (tnt_priv) { nec_priv =3D &tnt_priv->nec7210_priv; if (tnt_priv->irq) --=20 2.48.1