From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S937622AbXGMWsv (ORCPT ); Fri, 13 Jul 2007 18:48:51 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S936879AbXGMWpF (ORCPT ); Fri, 13 Jul 2007 18:45:05 -0400 Received: from ns2.uludag.org.tr ([193.140.100.220]:59098 "EHLO uludag.org.tr" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1761268AbXGMWpA (ORCPT ); Fri, 13 Jul 2007 18:45:00 -0400 From: "=?utf-8?q?S=2E=C3=87a=C4=9Flar?= Onur" Reply-To: caglar@pardus.org.tr Organization: =?utf-8?q?T=C3=9CB=C4=B0TAK_/?= UEKAE Subject: [PATCH 8/12] drivers/isdn/hisax/nj_s.c: replace pci_find_device with pci_get_device Date: Sat, 14 Jul 2007 01:44:45 +0300 User-Agent: KMail/1.9.7 MIME-Version: 1.0 Content-Disposition: inline To: LKML Cc: kkeil@suse.de, kai.germaschewski@gmx.de, isdn4linux@listserv.isdn4linux.de Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <200707140144.46741.caglar@pardus.org.tr> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Following patch replaces pci_find_device with pci_get_device to avoid following compiliation warning; drivers/isdn/hisax/nj_s.c: In function `setup_netjet_s': drivers/isdn/hisax/nj_s.c:173: warning: `pci_find_device' is deprecated (declared at include/linux/pci.h:478) and also removes trailing whitespaces at the ends of lines and converts smarttabs/whitespaces into real tabs Signed-off-by: S.Çağlar Onur --- drivers/isdn/hisax/nj_s.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) Index: linux-2.6/drivers/isdn/hisax/nj_s.c =================================================================== --- linux-2.6.orig/drivers/isdn/hisax/nj_s.c +++ linux-2.6/drivers/isdn/hisax/nj_s.c @@ -170,20 +170,20 @@ setup_netjet_s(struct IsdnCard *card) for ( ;; ) { - if ((dev_netjet = pci_find_device(PCI_VENDOR_ID_TIGERJET, + if ((dev_netjet = pci_get_device(PCI_VENDOR_ID_TIGERJET, PCI_DEVICE_ID_TIGERJET_300, dev_netjet))) { if (pci_enable_device(dev_netjet)) - return(0); + goto dev_netjet_cleanup; pci_set_master(dev_netjet); cs->irq = dev_netjet->irq; if (!cs->irq) { printk(KERN_WARNING "NETjet-S: No IRQ for PCI card found\n"); - return(0); + goto dev_netjet_cleanup; } cs->hw.njet.base = pci_resource_start(dev_netjet, 0); if (!cs->hw.njet.base) { printk(KERN_WARNING "NETjet-S: No IO-Adr for PCI card found\n"); - return(0); + goto dev_netjet_cleanup; } /* the TJ300 and TJ320 must be detected, the IRQ handling is different * unfortunatly the chips use the same device ID, but the TJ320 has @@ -199,7 +199,7 @@ setup_netjet_s(struct IsdnCard *card) (dev_netjet->subsystem_device == 0x02)) { printk(KERN_WARNING "Netjet: You tried to load this driver with an incompatible TigerJet-card\n"); printk(KERN_WARNING "Use type=41 for Formula-n enter:now ISDN PCI and compatible\n"); - return(0); + goto dev_netjet_cleanup; } /* end new code */ } else { @@ -237,8 +237,8 @@ setup_netjet_s(struct IsdnCard *card) default : printk( KERN_WARNING "NETjet-S: No PCI card found\n" ); return 0; - } - break; + } + break; } #else @@ -259,7 +259,7 @@ setup_netjet_s(struct IsdnCard *card) CardType[card->typ], cs->hw.njet.base, cs->hw.njet.base + bytecnt); - return (0); + goto dev_netjet_cleanup; } cs->readisac = &NETjet_ReadIC; cs->writeisac = &NETjet_WriteIC; @@ -273,5 +273,10 @@ setup_netjet_s(struct IsdnCard *card) cs->irq_func = &netjet_s_interrupt; cs->irq_flags |= IRQF_SHARED; ISACVersion(cs, "NETjet-S:"); + pci_dev_put(dev_netjet); return (1); + +dev_netjet_cleanup: + pci_dev_put(dev_netjet); + return (0); } -- S.Çağlar Onur http://cekirdek.pardus.org.tr/~caglar/ Linux is like living in a teepee. No Windows, no Gates and an Apache in house!