Re: [PATCH] Yet more PCI fixes for 2.5.70

From: Greg KH (greg@kroah.com)
Date: Tue Jun 10 2003 - 13:49:29 EST

ChangeSet 1.1368, 2003/06/09 16:11:04-07:00, greg@kroah.com

PCI: remove pci_present() from drivers/telephony/ixj.c

 drivers/telephony/ixj.c | 9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diff -Nru a/drivers/telephony/ixj.c b/drivers/telephony/ixj.c
--- a/drivers/telephony/ixj.c Tue Jun 10 11:18:19 2003
+++ b/drivers/telephony/ixj.c Tue Jun 10 11:18:19 2003
@@ -7821,9 +7821,6 @@
         IXJ *j = NULL;
         int result;
 
- if(!pci_present())
- return 0;
-
         for (i = 0; i < IXJMAX - *cnt; i++) {
                 pci = pci_find_device(0x15E2, 0x0500, pci);
                 if (!pci)
@@ -7869,10 +7866,8 @@
         if ((probe = ixj_probe_isa(&cnt)) < 0) {
                 return probe;
         }
- if (pci_present()) {
- if ((probe = ixj_probe_pci(&cnt)) < 0) {
- return probe;
- }
+ if ((probe = ixj_probe_pci(&cnt)) < 0) {
+ return probe;
         }
         printk("%s\n", ixj_c_rcsid);
         create_proc_read_entry ("ixj", 0, NULL, ixj_read_proc, NULL);

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

This archive was generated by hypermail 2b29 : Sun Jun 15 2003 - 22:00:24 EST