From mboxrd@z Thu Jan 1 00:00:00 1970 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 97113265637 for ; Fri, 14 Feb 2025 11:47:54 +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=1739533676; cv=none; b=t28+JaZZm8SncYwTK9muSdRMALwn8DsgBBgYy2aF0OMuLQCLWtnsEOleSmcFb+CLoD9yrhGzoS+yK5Z91zDczHpRWHnRL+pVJRcGyCJxBgcEmUEI4tpKbFYVI2IfNoDuA/o74/n091ggBBjptjuCBC9djPf4ahDo1zm1vy8Xj5o= 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=XHtW0sCr; 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="XHtW0sCr" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-4396d2e32b7so507915e9.0 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=lists.linux.dev; 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=XHtW0sCrGYM9y/Wx+CrX4HN8CKLfPXzOrHhxS4WLesoOFgTA73z4Xc7foV35Yp5/U5 BLrApTuSuGHTUZODqkBB3T0HLP6bEqWut4cXmVLibyyp9fwONkndgw7mFRXD7JGREwWF 2L5hfoCqAP/FAB1hBDp4BsvMBEBOdkSh3FdXiF5CMKZFWTDw9jOP3twzN/JejI3tntFU BxuYr4be0Nvx1uQf0/bbYU9CXpjiQu8k1MRNLwwDQtH4ZMdHorUfS/jlmahFuWvnVP+l sC/BpZurzfdZMACAB0nZhnZzscX89hPQWKmKPeh+2nIqcG+IRE6ltiYH7LQUby1lttNa +X+g== 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=ODxFpBGgOvbeWQxYcR6t8fb2apHFZ5XP+Z6Mf7NAcVIUTHSti33BHgsOwuX472I0i5 MH9n+Izq83RCC0fdbTnneongsXzd2L16w4T+6svZcDymhmHf7EhdnxLWwMMjo4BUkmPM uxaYctFZAO2HJDwK7B/ocde7W4cXUst3GZCCWmDSx5On3PgP3COnsy+CDtug8HsTlxXT MHKb0/SW+wPRIc0yIQfffP6EbwP3LFUuxYIaUjjafbgvmGWSqSeuXqd8gDmrti03++oQ vXNz/i0LM5epNbXDpXfcYXtlq5tyxc3O/exoeHTskXTF2Tzc6lGsEEgRM7285keRU/53 oZDw== X-Forwarded-Encrypted: i=1; AJvYcCXocdcaF6Vvswhf7TuEtIITGL1hBgDhFHD04Q43GDdVkn5Nk9/C8YJuirnkBbx1p7BV9i3n++G/Rls3b4ja@lists.linux.dev X-Gm-Message-State: AOJu0YxdtOh++MffbOZaJn+vYajkaG/QJB27M2k89c+D+JERlkUZxoPf HFw5lAlIZVngE0fcCLMO8kAf4Yf4h8MD4iZr8vdJEgu7LNvYnl1V X-Gm-Gg: ASbGncsEiAlIJcd5MV2AxuM0Gi9nAIdE4wfRdir2dZR1ZkctEL//wk8E5KSloVtZ45I MSSl38qBB1zlRh5Q5R0GOoo+o2ADk2XLT5qFGI9V7l3uWyp6FsR/yP1k7BGPU0kQwDUjfAcf8hf fnrNF/WApjC3kA+VWxSCZczOXHP0C1KgjwyghfBRX3pJqbUSJtW5e+A8xyz9UmnWZj06CkGsC+z klrLpoqIsm2+4BLMMfPAiUAePihSU7xmeFvQDQW28z6ds3YFhvg6/ZJqXXjqFraW/Y98x8xtq4y Di6d6N+jymup59tR6jff1UrGNvHjl0wuDMJWfMytLxfHmq1sBKM= 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-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 ***************************************************************************/ +#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, const 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 = 0x1000; @@ -280,7 +284,7 @@ static int pc2_generic_attach(gpib_board_t *board, const gpib_board_config_t *co // 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 = config->ibdma; @@ -306,8 +310,8 @@ static int pc2_attach(gpib_board_t *board, const gpib_board_config_t *config) nec_priv->offset = pc2_reg_offset; 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 = config->ibbase; @@ -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 = 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, const 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[0246]2e1, but is 0x%x\n", + config->ibbase); return -1; } 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 = 0; @@ -407,36 +412,36 @@ static int pc2a_common_attach(gpib_board_t *board, const 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 = 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 = 0; j < i; j++) release_region(config->ibbase + j * pc2a_reg_offset, 1); - return -1; + return -EBUSY; } } nec_priv->iobase = 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 = 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 = 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; } @@ -630,25 +635,25 @@ static int __init pc2_init_module(void) ret = gpib_register_driver(&pc2_interface, THIS_MODULE); if (ret) { - pr_err("pc2_gpib: gpib_register_driver failed: error = %d\n", ret); + pr_err("gpib_register_driver failed: error = %d\n", ret); return ret; } ret = gpib_register_driver(&pc2a_interface, THIS_MODULE); if (ret) { - pr_err("pc2_gpib: gpib_register_driver failed: error = %d\n", ret); + pr_err("gpib_register_driver failed: error = %d\n", ret); goto err_pc2a; } ret = gpib_register_driver(&pc2a_cb7210_interface, THIS_MODULE); if (ret) { - pr_err("pc2_gpib: gpib_register_driver failed: error = %d\n", ret); + pr_err("gpib_register_driver failed: error = %d\n", ret); goto err_cb7210; } ret = gpib_register_driver(&pc2_2a_interface, THIS_MODULE); if (ret) { - pr_err("pc2_gpib: gpib_register_driver failed: error = %d\n", ret); + pr_err("gpib_register_driver failed: error = %d\n", ret); goto err_pc2_2a; } -- 2.48.1