Skip to content

Commit 20a351c

Browse files
dpenklergregkh
authored andcommitted
staging: gpib: tnt4882 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 "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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 0de5124 commit 20a351c

File tree

2 files changed

+60
-143
lines changed

2 files changed

+60
-143
lines changed

drivers/staging/gpib/tnt4882/mite.c

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,13 @@ int mite_setup(struct mite_struct *mite)
8888
pr_err("mite: failed to remap mite io memory address.\n");
8989
return -ENOMEM;
9090
}
91-
pr_info("mite: 0x%08lx mapped to %p\n", mite->mite_phys_addr, mite->mite_io_addr);
9291
addr = pci_resource_start(mite->pcidev, 1);
9392
mite->daq_phys_addr = addr;
9493
mite->daq_io_addr = ioremap(mite->daq_phys_addr, pci_resource_len(mite->pcidev, 1));
9594
if (!mite->daq_io_addr) {
9695
pr_err("mite: failed to remap daq io memory address.\n");
9796
return -ENOMEM;
9897
}
99-
pr_info("mite: daq: 0x%08lx mapped to %p\n", mite->daq_phys_addr, mite->daq_io_addr);
10098
writel(mite->daq_phys_addr | WENAB, mite->mite_io_addr + MITE_IODWBSR);
10199
mite->used = 1;
102100
return 0;
@@ -133,18 +131,3 @@ void mite_unsetup(struct mite_struct *mite)
133131
}
134132
mite->used = 0;
135133
}
136-
137-
void mite_list_devices(void)
138-
{
139-
struct mite_struct *mite, *next;
140-
141-
pr_info("Available NI PCI device IDs:");
142-
if (mite_devices)
143-
for (mite = mite_devices; mite; mite = next) {
144-
next = mite->next;
145-
pr_info(" 0x%04x", mite_device_id(mite));
146-
if (mite->used)
147-
pr_info("(used)");
148-
}
149-
pr_info("\n");
150-
}

0 commit comments

Comments
 (0)