mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-09 11:23:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: comedi: addi-data: remove v_pci_card_list_display()

Browse Source 
This function dumps a list of all the add-data PCI cards found. This
information is just noise. Remove the function.

Also, remove the parameter from v_pci_card_list_init() that caused
this information to be dumped.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten
2012-10-31 16:54:43 -07:00
committed by Greg Kroah-Hartman
parent 20a22b706b
commit 92db8be4ca
2 changed files with 3 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/staging/comedi/drivers/addi-data/addi_amcc_s5933.h
View File

@@ -212,7 +212,7 @@ static const int i_ADDIDATADeviceID[] = { 0x15B8, 0x10E8 };
/****************************************************************************/
void v_pci_card_list_init(unsigned short pci_vendor, char display);
void v_pci_card_list_init(unsigned short pci_vendor);
void v_pci_card_list_cleanup(unsigned short pci_vendor);
struct pcilst_struct *ptr_find_free_pci_card_by_device(unsigned short vendor_id,
unsigned short
@@ -230,7 +230,6 @@ struct pcilst_struct *ptr_select_and_alloc_pci_card(unsigned short vendor_id,
int pci_card_alloc(struct pcilst_struct *amcc, int master);
int i_pci_card_free(struct pcilst_struct *amcc);
void v_pci_card_list_display(void);
int i_pci_card_data(struct pcilst_struct *amcc,
unsigned char *pci_bus, unsigned char *pci_slot,
unsigned char *pci_func, resource_size_t * io_addr,
@@ -239,7 +238,7 @@ int i_pci_card_data(struct pcilst_struct *amcc,
/****************************************************************************/
/* build list of amcc cards in this system */
void v_pci_card_list_init(unsigned short pci_vendor, char display)
void v_pci_card_list_init(unsigned short pci_vendor)
{
struct pci_dev *pcidev = NULL;
struct pcilst_struct *amcc, *last;
@@ -279,9 +278,6 @@ void v_pci_card_list_init(unsigned short pci_vendor, char display)
}
}
}
if (display)
v_pci_card_list_display();
}
/****************************************************************************/
@@ -384,28 +380,6 @@ int i_pci_card_free(struct pcilst_struct *amcc)
return 0;
}
/****************************************************************************/
/* display list of found cards */
void v_pci_card_list_display(void)
{
struct pcilst_struct *amcc, *next;
printk(KERN_DEBUG "List of pci cards\n");
printk(KERN_DEBUG "bus:slot:func vendor device io_amcc io_daq irq used\n");
for (amcc = amcc_devices; amcc; amcc = next) {
next = amcc->next;
printk
("%2d %2d %2d 0x%4x 0x%4x 0x%8llx 0x%8llx %2u %2d\n",
amcc->pci_bus, amcc->pci_slot, amcc->pci_func,
amcc->vendor, amcc->device,
(unsigned long long)amcc->io_addr[0],
(unsigned long long)amcc->io_addr[2], amcc->irq,
amcc->used);
}
}
/****************************************************************************/
/* return all card information for driver */
int i_pci_card_data(struct pcilst_struct *amcc,

2
drivers/staging/comedi/drivers/addi-data/addi_common.c
View File

@@ -104,7 +104,7 @@ static int i_ADDI_Attach(struct comedi_device *dev, struct comedi_devconfig *it)
dev->private = devpriv;
if (!pci_list_builded) {
v_pci_card_list_init(this_board->i_VendorId, 1); /* 1 for displaying the list.. */
v_pci_card_list_init(this_board->i_VendorId);
pci_list_builded = 1;
}