mirror of
https://github.com/torvalds/linux.git
synced 2026-07-28 10:09:10 +02:00
staging: gpib: cb7210 console messaging cleanup
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 <dpenkler@gmail.com> Link: https://lore.kernel.org/r/20250220090920.32497-1-dpenkler@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Dave Penkler
Greg Kroah-Hartman
parent
1cddb72bf8
commit
82e3508046
|
|
@ -5,6 +5,10 @@
|
|||
* copyright : (C) 2001, 2002 by Frank Mori Hess
|
||||
***************************************************************************/
|
||||
|
||||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||
#define dev_fmt pr_fmt
|
||||
#define DRV_NAME KBUILD_MODNAME
|
||||
|
||||
#include "cb7210.h"
|
||||
#include <linux/ioport.h>
|
||||
#include <linux/sched.h>
|
||||
|
|
@ -83,12 +87,12 @@ static int fifo_read(gpib_board_t *board, struct cb7210_priv *cb_priv, uint8_t *
|
|||
|
||||
*bytes_read = 0;
|
||||
if (cb_priv->fifo_iobase == 0) {
|
||||
pr_err("cb7210: fifo iobase is zero!\n");
|
||||
dev_err(board->gpib_dev, "fifo iobase is zero!\n");
|
||||
return -EIO;
|
||||
}
|
||||
*end = 0;
|
||||
if (length <= 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;
|
||||
}
|
||||
|
||||
|
|
@ -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 = -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 = -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 *buffer, size_t length, size_
|
|||
|
||||
*bytes_written = 0;
|
||||
if (cb_priv->fifo_iobase == 0) {
|
||||
pr_err("cb7210: fifo iobase is zero!\n");
|
||||
dev_err(board->gpib_dev, "fifo iobase is zero!\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
if (length == 0)
|
||||
|
|
@ -293,7 +294,6 @@ static int fifo_write(gpib_board_t *board, uint8_t *buffer, 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 = -ERESTARTSYS;
|
||||
break;
|
||||
}
|
||||
|
|
@ -309,7 +309,7 @@ static int fifo_write(gpib_board_t *board, uint8_t *buffer, size_t length, size_
|
|||
if (num_bytes + count > length)
|
||||
num_bytes = 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 = -EINVAL;
|
||||
break;
|
||||
}
|
||||
|
|
@ -334,7 +334,6 @@ static int fifo_write(gpib_board_t *board, uint8_t *buffer, 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 = -ERESTARTSYS;
|
||||
}
|
||||
if (test_bit(TIMO_NUM, &board->status))
|
||||
|
|
@ -480,7 +479,7 @@ static irqreturn_t cb7210_internal_interrupt(gpib_board_t *board)
|
|||
status2 = read_byte(nec_priv, ISR2);
|
||||
nec7210_interrupt_have_status(board, nec_priv, status1, status2);
|
||||
|
||||
dev_dbg(board->gpib_dev, "cb7210: status 0x%x, mode 0x%x\n", hs_status, priv->hs_mode_bits);
|
||||
dev_dbg(board->gpib_dev, "status 0x%x, mode 0x%x\n", hs_status, priv->hs_mode_bits);
|
||||
|
||||
clear_bits = 0;
|
||||
|
||||
|
|
@ -858,7 +857,7 @@ static int cb7210_allocate_private(gpib_board_t *board)
|
|||
|
||||
board->private_data = kmalloc(sizeof(struct cb7210_priv), GFP_KERNEL);
|
||||
if (!board->private_data)
|
||||
return -1;
|
||||
return -ENOMEM;
|
||||
priv = board->private_data;
|
||||
memset(priv, 0, sizeof(struct cb7210_priv));
|
||||
init_nec7210_private(&priv->nec7210_priv);
|
||||
|
|
@ -920,7 +919,7 @@ static int cb7210_init(struct cb7210_priv *cb_priv, gpib_board_t *board)
|
|||
|
||||
/* 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;
|
||||
|
|
@ -960,17 +959,17 @@ static int cb_pci_attach(gpib_board_t *board, const gpib_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;
|
||||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
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 = pci_resource_start(cb_priv->pci_device, 0);
|
||||
|
|
@ -982,13 +981,14 @@ static int cb_pci_attach(gpib_board_t *board, const gpib_board_config_t *config)
|
|||
cb_priv->fifo_iobase = nec_priv->iobase;
|
||||
break;
|
||||
default:
|
||||
pr_err("cb7210: bug! unhandled pci_chip=%i\n", cb_priv->pci_chip);
|
||||
dev_err(board->gpib_dev, "bug! unhandled pci_chip=%i\n", cb_priv->pci_chip);
|
||||
return -EIO;
|
||||
}
|
||||
isr_flags |= IRQF_SHARED;
|
||||
if (request_irq(cb_priv->pci_device->irq, cb_pci_interrupt, isr_flags, "cb7210", 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, DRV_NAME, board)) {
|
||||
dev_err(board->gpib_dev, "can't request IRQ %d\n",
|
||||
cb_priv->pci_device->irq);
|
||||
return -EBUSY;
|
||||
}
|
||||
cb_priv->irq = cb_priv->pci_device->irq;
|
||||
|
||||
|
|
@ -1043,20 +1043,22 @@ static int cb_isa_attach(gpib_board_t *board, const gpib_board_config_t *config)
|
|||
return retval;
|
||||
cb_priv = board->private_data;
|
||||
nec_priv = &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->ibbase);
|
||||
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 = config->ibbase;
|
||||
cb_priv->fifo_iobase = nec7210_iobase(cb_priv);
|
||||
|
||||
bits = irq_bits(config->ibirq);
|
||||
if (bits == 0)
|
||||
pr_err("board incapable of using irq %i, try 2-5, 7, 10, or 11\n", config->ibirq);
|
||||
dev_err(board->gpib_dev, "board incapable of using irq %i, try 2-5, 7, 10, or 11\n",
|
||||
config->ibirq);
|
||||
|
||||
// install interrupt handler
|
||||
if (request_irq(config->ibirq, cb7210_interrupt, isr_flags, "cb7210", board)) {
|
||||
pr_err("gpib: can't request IRQ %d\n", config->ibirq);
|
||||
if (request_irq(config->ibirq, cb7210_interrupt, isr_flags, DRV_NAME, board)) {
|
||||
dev_err(board->gpib_dev, "failed to obtain IRQ %d\n", config->ibirq);
|
||||
return -EBUSY;
|
||||
}
|
||||
cb_priv->irq = config->ibirq;
|
||||
|
|
@ -1096,7 +1098,7 @@ static const struct pci_device_id cb7210_pci_table[] = {
|
|||
MODULE_DEVICE_TABLE(pci, cb7210_pci_table);
|
||||
|
||||
static struct pci_driver cb7210_pci_driver = {
|
||||
.name = "cb7210",
|
||||
.name = DRV_NAME,
|
||||
.id_table = cb7210_pci_table,
|
||||
.probe = &cb7210_pci_probe
|
||||
};
|
||||
|
|
@ -1119,23 +1121,6 @@ static struct pci_driver cb7210_pci_driver = {
|
|||
#include <pcmcia/cistpl.h>
|
||||
#include <pcmcia/ds.h>
|
||||
|
||||
/*
|
||||
* 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=0, the debug code will
|
||||
* be present but disabled -- but it can then be enabled for specific
|
||||
* modules at load time with a 'pc_debug=#' option to insmod.
|
||||
*/
|
||||
|
||||
#define PCMCIA_DEBUG 1
|
||||
|
||||
#ifdef PCMCIA_DEBUG
|
||||
static int pc_debug = 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
|
||||
|
|
@ -1200,8 +1185,6 @@ static int cb_gpib_probe(struct pcmcia_device *link)
|
|||
|
||||
// int ret, i;
|
||||
|
||||
DEBUG(0, "%s(0x%p)\n", __func__, link);
|
||||
|
||||
/* Allocate space for private device-specific data */
|
||||
info = kzalloc(sizeof(*info), GFP_KERNEL);
|
||||
if (!info)
|
||||
|
|
@ -1241,8 +1224,6 @@ static void cb_gpib_remove(struct pcmcia_device *link)
|
|||
struct local_info *info = link->priv;
|
||||
//struct gpib_board_t *dev = info->dev;
|
||||
|
||||
DEBUG(0, "%s(0x%p)\n", __func__, link);
|
||||
|
||||
if (info->dev)
|
||||
cb_pcmcia_detach(info->dev);
|
||||
cb_gpib_release(link);
|
||||
|
|
@ -1270,7 +1251,6 @@ static int cb_gpib_config(struct pcmcia_device *link)
|
|||
|
||||
handle = link;
|
||||
dev = link->priv;
|
||||
DEBUG(0, "%s(0x%p)\n", __func__, link);
|
||||
|
||||
retval = pcmcia_loop_config(link, &cb_gpib_config_iteration, NULL);
|
||||
if (retval) {
|
||||
|
|
@ -1279,8 +1259,6 @@ static int cb_gpib_config(struct pcmcia_device *link)
|
|||
return -ENODEV;
|
||||
}
|
||||
|
||||
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.
|
||||
|
|
@ -1292,7 +1270,6 @@ static int cb_gpib_config(struct pcmcia_device *link)
|
|||
return -ENODEV;
|
||||
}
|
||||
|
||||
pr_info("gpib device loaded\n");
|
||||
return 0;
|
||||
} /* gpib_config */
|
||||
|
||||
|
|
@ -1304,7 +1281,6 @@ static int cb_gpib_config(struct pcmcia_device *link)
|
|||
|
||||
static void cb_gpib_release(struct pcmcia_device *link)
|
||||
{
|
||||
DEBUG(0, "%s(0x%p)\n", __func__, link);
|
||||
pcmcia_disable_device(link);
|
||||
}
|
||||
|
||||
|
|
@ -1312,10 +1288,9 @@ static int cb_gpib_suspend(struct pcmcia_device *link)
|
|||
{
|
||||
//struct local_info *info = link->priv;
|
||||
//struct gpib_board_t *dev = info->dev;
|
||||
DEBUG(0, "%s(0x%p)\n", __func__, link);
|
||||
|
||||
if (link->open)
|
||||
pr_warn("Device still open ???\n");
|
||||
dev_warn(&link->dev, "Device still open\n");
|
||||
//netif_device_detach(dev);
|
||||
|
||||
return 0;
|
||||
|
|
@ -1325,11 +1300,9 @@ static int cb_gpib_resume(struct pcmcia_device *link)
|
|||
{
|
||||
//struct local_info *info = link->priv;
|
||||
//struct gpib_board_t *dev = info->dev;
|
||||
DEBUG(0, "%s(0x%p)\n", __func__, link);
|
||||
|
||||
/*if (link->open) {
|
||||
* ni_gpib_probe(dev); / really?
|
||||
* printk("Gpib resumed ???\n");
|
||||
* //netif_device_attach(dev);
|
||||
*
|
||||
*/
|
||||
|
|
@ -1356,7 +1329,6 @@ static struct pcmcia_driver cb_gpib_cs_driver = {
|
|||
|
||||
static void cb_pcmcia_cleanup_module(void)
|
||||
{
|
||||
DEBUG(0, "cb_gpib_cs: unloading\n");
|
||||
pcmcia_unregister_driver(&cb_gpib_cs_driver);
|
||||
}
|
||||
|
||||
|
|
@ -1451,8 +1423,8 @@ static int cb_pcmcia_attach(gpib_board_t *board, const gpib_board_config_t *conf
|
|||
int retval;
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
retval = cb7210_generic_attach(board);
|
||||
|
|
@ -1463,18 +1435,17 @@ static int cb_pcmcia_attach(gpib_board_t *board, const gpib_board_config_t *conf
|
|||
nec_priv = &cb_priv->nec7210_priv;
|
||||
|
||||
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 = curr_dev->resource[0]->start;
|
||||
cb_priv->fifo_iobase = curr_dev->resource[0]->start;
|
||||
|
||||
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, board)) {
|
||||
dev_err(board->gpib_dev, "failed to request IRQ %d\n", curr_dev->irq);
|
||||
return -EBUSY;
|
||||
}
|
||||
cb_priv->irq = curr_dev->irq;
|
||||
|
||||
|
|
@ -1507,68 +1478,68 @@ static int __init cb7210_init_module(void)
|
|||
|
||||
ret = pci_register_driver(&cb7210_pci_driver);
|
||||
if (ret) {
|
||||
pr_err("cb7210: pci_register_driver failed: error = %d\n", ret);
|
||||
pr_err("pci_register_driver failed: error = %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = gpib_register_driver(&cb_pci_interface, THIS_MODULE);
|
||||
if (ret) {
|
||||
pr_err("cb7210: gpib_register_driver failed: error = %d\n", ret);
|
||||
pr_err("gpib_register_driver failed: error = %d\n", ret);
|
||||
goto err_pci;
|
||||
}
|
||||
|
||||
ret = gpib_register_driver(&cb_isa_interface, THIS_MODULE);
|
||||
if (ret) {
|
||||
pr_err("cb7210: gpib_register_driver failed: error = %d\n", ret);
|
||||
pr_err("gpib_register_driver failed: error = %d\n", ret);
|
||||
goto err_isa;
|
||||
}
|
||||
|
||||
ret = gpib_register_driver(&cb_pci_accel_interface, THIS_MODULE);
|
||||
if (ret) {
|
||||
pr_err("cb7210: gpib_register_driver failed: error = %d\n", ret);
|
||||
pr_err("gpib_register_driver failed: error = %d\n", ret);
|
||||
goto err_pci_accel;
|
||||
}
|
||||
|
||||
ret = gpib_register_driver(&cb_pci_unaccel_interface, THIS_MODULE);
|
||||
if (ret) {
|
||||
pr_err("cb7210: gpib_register_driver failed: error = %d\n", ret);
|
||||
pr_err("gpib_register_driver failed: error = %d\n", ret);
|
||||
goto err_pci_unaccel;
|
||||
}
|
||||
|
||||
ret = gpib_register_driver(&cb_isa_accel_interface, THIS_MODULE);
|
||||
if (ret) {
|
||||
pr_err("cb7210: gpib_register_driver failed: error = %d\n", ret);
|
||||
pr_err("gpib_register_driver failed: error = %d\n", ret);
|
||||
goto err_isa_accel;
|
||||
}
|
||||
|
||||
ret = gpib_register_driver(&cb_isa_unaccel_interface, THIS_MODULE);
|
||||
if (ret) {
|
||||
pr_err("cb7210: gpib_register_driver failed: error = %d\n", ret);
|
||||
pr_err("gpib_register_driver failed: error = %d\n", ret);
|
||||
goto err_isa_unaccel;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_GPIB_PCMCIA
|
||||
ret = gpib_register_driver(&cb_pcmcia_interface, THIS_MODULE);
|
||||
if (ret) {
|
||||
pr_err("cb7210: gpib_register_driver failed: error = %d\n", ret);
|
||||
pr_err("gpib_register_driver failed: error = %d\n", ret);
|
||||
goto err_pcmcia;
|
||||
}
|
||||
|
||||
ret = gpib_register_driver(&cb_pcmcia_accel_interface, THIS_MODULE);
|
||||
if (ret) {
|
||||
pr_err("cb7210: gpib_register_driver failed: error = %d\n", ret);
|
||||
pr_err("gpib_register_driver failed: error = %d\n", ret);
|
||||
goto err_pcmcia_accel;
|
||||
}
|
||||
|
||||
ret = gpib_register_driver(&cb_pcmcia_unaccel_interface, THIS_MODULE);
|
||||
if (ret) {
|
||||
pr_err("cb7210: gpib_register_driver failed: error = %d\n", ret);
|
||||
pr_err("gpib_register_driver failed: error = %d\n", ret);
|
||||
goto err_pcmcia_unaccel;
|
||||
}
|
||||
|
||||
ret = pcmcia_register_driver(&cb_gpib_cs_driver);
|
||||
if (ret) {
|
||||
pr_err("cb7210: pcmcia_register_driver failed: error = %d\n", ret);
|
||||
pr_err("pcmcia_register_driver failed: error = %d\n", ret);
|
||||
goto err_pcmcia_driver;
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user