* Can we remove pci_find_device() yet? @ 2010-01-08 0:22 Stephen Rothwell 2010-01-08 4:46 ` Greg KH 0 siblings, 1 reply; 27+ messages in thread From: Stephen Rothwell @ 2010-01-08 0:22 UTC (permalink / raw) To: LKML; +Cc: netdev, Karsten Keil, isdn4linux, Greg Kroah-Hartman [-- Attachment #1: Type: text/plain, Size: 364 bytes --] Hi all, This interface has been deprecated since November 2006, so can something be done about the last users (I think only some ISDN drivers)? Or should we just remove the interface and mark those drivers BROKEN (and maybe move them to staging)? -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --] ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: Can we remove pci_find_device() yet? 2010-01-08 0:22 Can we remove pci_find_device() yet? Stephen Rothwell @ 2010-01-08 4:46 ` Greg KH 2010-01-11 19:46 ` Tilman Schmidt 0 siblings, 1 reply; 27+ messages in thread From: Greg KH @ 2010-01-08 4:46 UTC (permalink / raw) To: Stephen Rothwell; +Cc: LKML, netdev, Karsten Keil, isdn4linux On Fri, Jan 08, 2010 at 11:22:36AM +1100, Stephen Rothwell wrote: > Hi all, > > This interface has been deprecated since November 2006, so can something > be done about the last users (I think only some ISDN drivers)? Or should > we just remove the interface and mark those drivers BROKEN (and maybe > move them to staging)? Ick, the "new" isdn drivers are still not merged that replace those older ones? I thought that happened a while ago. Karsten, what are you plans on dropping them? I recommend putting them in staging if you want a way to get them out of the kernel tree :) thanks, greg k-h ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: Can we remove pci_find_device() yet? 2010-01-08 4:46 ` Greg KH @ 2010-01-11 19:46 ` Tilman Schmidt 2010-01-11 20:01 ` Greg KH 0 siblings, 1 reply; 27+ messages in thread From: Tilman Schmidt @ 2010-01-11 19:46 UTC (permalink / raw) To: Greg KH; +Cc: Stephen Rothwell, LKML, netdev, Karsten Keil, isdn4linux Am 08.01.2010 05:46 schrieb Greg KH: > On Fri, Jan 08, 2010 at 11:22:36AM +1100, Stephen Rothwell wrote: >> >> This interface has been deprecated since November 2006, so can something >> be done about the last users (I think only some ISDN drivers)? That would be the HiSax I4L drivers. > Ick, the "new" isdn drivers are still not merged that replace those > older ones? I thought that happened a while ago. mISDN, which is the designated successor to HiSax, has indeed been merged in 2008. Trouble is, mISDN's userspace interface is completely different from I4L. Removing HiSax would therefore break userspace compatibility for current users of HiSax supported devices. In order to switch to mISDN they'll have to replace all of their ISDN4Linux applications with equivalent mISDN ones, and I'm not even sure there is a replacement for everything. Just an idea - as a stopgap measure, couldn't pci_find_device() be made a private function of the HiSax drivers? That way, the remainder of the kernel won't be polluted by it anymore, and the PCI_LEGACY config option can be dropped. Something like this quick and dirty hack: diff --git a/drivers/isdn/hisax/Kconfig b/drivers/isdn/hisax/Kconfig index 3464ebc..452fde9 100644 --- a/drivers/isdn/hisax/Kconfig +++ b/drivers/isdn/hisax/Kconfig @@ -109,7 +109,7 @@ config HISAX_16_3 config HISAX_TELESPCI bool "Teles PCI" - depends on PCI && PCI_LEGACY && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) + depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) help This enables HiSax support for the Teles PCI. See <file:Documentation/isdn/README.HiSax> on how to configure it. @@ -237,7 +237,7 @@ config HISAX_MIC config HISAX_NETJET bool "NETjet card" - depends on PCI && PCI_LEGACY && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) + depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) help This enables HiSax support for the NetJet from Traverse Technologies. @@ -248,7 +248,7 @@ config HISAX_NETJET config HISAX_NETJET_U bool "NETspider U card" - depends on PCI && PCI_LEGACY && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) + depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) help This enables HiSax support for the Netspider U interface ISDN card from Traverse Technologies. @@ -287,7 +287,7 @@ config HISAX_HSTSAPHIR config HISAX_BKM_A4T bool "Telekom A4T card" - depends on PCI && PCI_LEGACY + depends on PCI help This enables HiSax support for the Telekom A4T card. @@ -297,7 +297,7 @@ config HISAX_BKM_A4T config HISAX_SCT_QUADRO bool "Scitel Quadro card" - depends on PCI && PCI_LEGACY + depends on PCI help This enables HiSax support for the Scitel Quadro card. @@ -316,7 +316,7 @@ config HISAX_GAZEL config HISAX_HFC_PCI bool "HFC PCI-Bus cards" - depends on PCI && PCI_LEGACY && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) + depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) help This enables HiSax support for the HFC-S PCI 2BDS0 based cards. @@ -325,7 +325,7 @@ config HISAX_HFC_PCI config HISAX_W6692 bool "Winbond W6692 based cards" - depends on PCI && PCI_LEGACY + depends on PCI help This enables HiSax support for Winbond W6692 based PCI ISDN cards. @@ -341,7 +341,7 @@ config HISAX_HFC_SX config HISAX_ENTERNOW_PCI bool "Formula-n enter:now PCI card" - depends on HISAX_NETJET && PCI && PCI_LEGACY && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) + depends on HISAX_NETJET && PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) help This enables HiSax support for the Formula-n enter:now PCI ISDN card. @@ -412,7 +412,7 @@ config HISAX_HFC4S8S config HISAX_FRITZ_PCIPNP tristate "AVM Fritz!Card PCI/PCIv2/PnP support (EXPERIMENTAL)" - depends on PCI && PCI_LEGACY && EXPERIMENTAL + depends on PCI && EXPERIMENTAL help This enables the driver for the AVM Fritz!Card PCI, Fritz!Card PCI v2 and Fritz!Card PnP. diff --git a/drivers/isdn/hisax/avm_pci.c b/drivers/isdn/hisax/avm_pci.c index 7cabc5a..f8d21a0 100644 --- a/drivers/isdn/hisax/avm_pci.c +++ b/drivers/isdn/hisax/avm_pci.c @@ -822,15 +822,6 @@ static int __devinit avm_pnp_setup(struct IsdnCardState *cs) #endif /* __ISAPNP__ */ -#ifndef CONFIG_PCI_LEGACY - -static int __devinit avm_pci_setup(struct IsdnCardState *cs) -{ - return(1); /* no-op: success */ -} - -#else - static struct pci_dev *dev_avm __devinitdata = NULL; static int __devinit avm_pci_setup(struct IsdnCardState *cs) @@ -864,8 +855,6 @@ static int __devinit avm_pci_setup(struct IsdnCardState *cs) return (1); } -#endif /* CONFIG_PCI_LEGACY */ - int __devinit setup_avm_pcipnp(struct IsdnCard *card) { diff --git a/drivers/isdn/hisax/diva.c b/drivers/isdn/hisax/diva.c index 0b0c2e5..830ad46 100644 --- a/drivers/isdn/hisax/diva.c +++ b/drivers/isdn/hisax/diva.c @@ -1148,7 +1148,6 @@ static int __devinit setup_diva_isapnp(struct IsdnCard *card) #endif /* ISAPNP */ -#ifdef CONFIG_PCI_LEGACY static struct pci_dev *dev_diva __devinitdata = NULL; static struct pci_dev *dev_diva_u __devinitdata = NULL; static struct pci_dev *dev_diva201 __devinitdata = NULL; @@ -1229,15 +1228,6 @@ static int __devinit setup_diva_pci(struct IsdnCard *card) return (1); /* card found */ } -#else /* if !CONFIG_PCI_LEGACY */ - -static int __devinit setup_diva_pci(struct IsdnCard *card) -{ - return (-1); /* card not found; continue search */ -} - -#endif /* CONFIG_PCI_LEGACY */ - int __devinit setup_diva(struct IsdnCard *card) { diff --git a/drivers/isdn/hisax/elsa.c b/drivers/isdn/hisax/elsa.c index aa29d1c..28f6620 100644 --- a/drivers/isdn/hisax/elsa.c +++ b/drivers/isdn/hisax/elsa.c @@ -1025,7 +1025,6 @@ setup_elsa_pcmcia(struct IsdnCard *card) cs->irq); } -#ifdef CONFIG_PCI_LEGACY static struct pci_dev *dev_qs1000 __devinitdata = NULL; static struct pci_dev *dev_qs3000 __devinitdata = NULL; @@ -1086,15 +1085,6 @@ setup_elsa_pci(struct IsdnCard *card) return (1); } -#else - -static int __devinit -setup_elsa_pci(struct IsdnCard *card) -{ - return (1); -} -#endif /* CONFIG_PCI_LEGACY */ - static int __devinit setup_elsa_common(struct IsdnCard *card) { diff --git a/drivers/isdn/hisax/gazel.c b/drivers/isdn/hisax/gazel.c index 0ea3b46..c25f455 100644 --- a/drivers/isdn/hisax/gazel.c +++ b/drivers/isdn/hisax/gazel.c @@ -531,7 +531,6 @@ setup_gazelisa(struct IsdnCard *card, struct IsdnCardState *cs) return (0); } -#ifdef CONFIG_PCI_LEGACY static struct pci_dev *dev_tel __devinitdata = NULL; static int __devinit @@ -620,7 +619,6 @@ setup_gazelpci(struct IsdnCardState *cs) return (0); } -#endif /* CONFIG_PCI_LEGACY */ int __devinit setup_gazel(struct IsdnCard *card) @@ -639,14 +637,8 @@ setup_gazel(struct IsdnCard *card) if (setup_gazelisa(card, cs)) return (0); } else { - -#ifdef CONFIG_PCI_LEGACY if (setup_gazelpci(cs)) return (0); -#else - printk(KERN_WARNING "Gazel: Card PCI requested and NO_PCI_BIOS, unable to config\n"); - return (0); -#endif /* CONFIG_PCI */ } if (reserve_regions(card, cs)) { diff --git a/drivers/isdn/hisax/hisax.h b/drivers/isdn/hisax/hisax.h index 0685c19..63c8359 100644 --- a/drivers/isdn/hisax/hisax.h +++ b/drivers/isdn/hisax/hisax.h @@ -1323,3 +1323,22 @@ void release_tei(struct IsdnCardState *cs); char *HiSax_getrev(const char *revision); int TeiNew(void); void TeiFree(void); + +#ifdef CONFIG_PCI + +#include <linux/pci.h> + +/* FIXME */ +static inline struct pci_dev *pci_find_device(unsigned int vendor, + unsigned int device, + struct pci_dev *from) +{ + struct pci_dev *pdev; + + pci_dev_get(from); + pdev = pci_get_subsys(vendor, device, PCI_ANY_ID, PCI_ANY_ID, from); + pci_dev_put(pdev); + return pdev; +} + +#endif diff --git a/drivers/isdn/hisax/niccy.c b/drivers/isdn/hisax/niccy.c index ef00633..13922f6 100644 --- a/drivers/isdn/hisax/niccy.c +++ b/drivers/isdn/hisax/niccy.c @@ -297,7 +297,6 @@ int __devinit setup_niccy(struct IsdnCard *card) return 0; } } else { -#ifdef CONFIG_PCI_LEGACY static struct pci_dev *niccy_dev __devinitdata; u_int pci_ioaddr; @@ -350,11 +349,6 @@ int __devinit setup_niccy(struct IsdnCard *card) release_region(cs->hw.niccy.isac, 4); return 0; } -#else - printk(KERN_WARNING "Niccy: io0 0 and NO_PCI_BIOS\n"); - printk(KERN_WARNING "Niccy: unable to config NICCY PCI\n"); - return 0; -#endif /* CONFIG_PCI_LEGACY */ } printk(KERN_INFO "HiSax: NICCY %s config irq:%d data:0x%X ale:0x%X\n", (cs->subtyp == 1) ? "PnP" : "PCI", diff --git a/drivers/isdn/hisax/sedlbauer.c b/drivers/isdn/hisax/sedlbauer.c index 5569a52..5cdcb0d 100644 --- a/drivers/isdn/hisax/sedlbauer.c +++ b/drivers/isdn/hisax/sedlbauer.c @@ -598,7 +598,6 @@ setup_sedlbauer_isapnp(struct IsdnCard *card, int *bytecnt) } #endif /* __ISAPNP__ */ -#ifdef CONFIG_PCI_LEGACY static struct pci_dev *dev_sedl __devinitdata = NULL; static int __devinit @@ -665,16 +664,6 @@ setup_sedlbauer_pci(struct IsdnCard *card) return (1); } -#else - -static int __devinit -setup_sedlbauer_pci(struct IsdnCard *card) -{ - return (1); -} - -#endif /* CONFIG_PCI_LEGACY */ - int __devinit setup_sedlbauer(struct IsdnCard *card) { diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig index b1ecefa..7858a11 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig @@ -21,17 +21,6 @@ config PCI_MSI If you don't know what to do here, say N. -config PCI_LEGACY - bool "Enable deprecated pci_find_* API" - depends on PCI - default y - help - Say Y here if you want to include support for the deprecated - pci_find_device() API. Most drivers have been converted over - to using the proper hotplug APIs, so this option serves to - include/exclude only a few drivers that are still using this - API. - config PCI_DEBUG bool "PCI Debugging" depends on PCI && DEBUG_KERNEL diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile index 4df48d5..f635608 100644 --- a/drivers/pci/Makefile +++ b/drivers/pci/Makefile @@ -8,9 +8,6 @@ obj-y += access.o bus.o probe.o remove.o pci.o quirks.o \ obj-$(CONFIG_PROC_FS) += proc.o obj-$(CONFIG_SYSFS) += slot.o -obj-$(CONFIG_PCI_LEGACY) += legacy.o -CFLAGS_legacy.o += -Wno-deprecated-declarations - # Build PCI Express stuff if needed obj-$(CONFIG_PCIEPORTBUS) += pcie/ diff --git a/drivers/pci/legacy.c b/drivers/pci/legacy.c deleted file mode 100644 index 871f65c..0000000 --- a/drivers/pci/legacy.c +++ /dev/null @@ -1,34 +0,0 @@ -#include <linux/init.h> -#include <linux/pci.h> -#include <linux/module.h> -#include <linux/interrupt.h> -#include "pci.h" - -/** - * pci_find_device - begin or continue searching for a PCI device by vendor/device id - * @vendor: PCI vendor id to match, or %PCI_ANY_ID to match all vendor ids - * @device: PCI device id to match, or %PCI_ANY_ID to match all device ids - * @from: Previous PCI device found in search, or %NULL for new search. - * - * Iterates through the list of known PCI devices. If a PCI device is found - * with a matching @vendor and @device, a pointer to its device structure is - * returned. Otherwise, %NULL is returned. - * A new search is initiated by passing %NULL as the @from argument. - * Otherwise if @from is not %NULL, searches continue from next device - * on the global list. - * - * NOTE: Do not use this function any more; use pci_get_device() instead, as - * the PCI device returned by this function can disappear at any moment in - * time. - */ -struct pci_dev *pci_find_device(unsigned int vendor, unsigned int device, - struct pci_dev *from) -{ - struct pci_dev *pdev; - - pci_dev_get(from); - pdev = pci_get_subsys(vendor, device, PCI_ANY_ID, PCI_ANY_ID, from); - pci_dev_put(pdev); - return pdev; -} -EXPORT_SYMBOL(pci_find_device); diff --git a/include/linux/pci.h b/include/linux/pci.h index 174e539..dd9682c 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -615,12 +615,6 @@ extern void pci_sort_breadthfirst(void); /* Generic PCI functions exported to card drivers */ -#ifdef CONFIG_PCI_LEGACY -struct pci_dev __deprecated *pci_find_device(unsigned int vendor, - unsigned int device, - struct pci_dev *from); -#endif /* CONFIG_PCI_LEGACY */ - enum pci_lost_interrupt_reason { PCI_LOST_IRQ_NO_INFORMATION = 0, PCI_LOST_IRQ_DISABLE_MSI, @@ -973,13 +967,6 @@ static inline int pci_proc_domain(struct pci_bus *bus) _PCI_NOP_ALL(read, *) _PCI_NOP_ALL(write,) -static inline struct pci_dev *pci_find_device(unsigned int vendor, - unsigned int device, - struct pci_dev *from) -{ - return NULL; -} - static inline struct pci_dev *pci_get_device(unsigned int vendor, unsigned int device, struct pci_dev *from) -- Tilman Schmidt E-Mail: tilman@imap.cc Bonn, Germany Diese Nachricht besteht zu 100% aus wiederverwerteten Bits. Ungeöffnet mindestens haltbar bis: (siehe Rückseite) ^ permalink raw reply related [flat|nested] 27+ messages in thread
* Re: Can we remove pci_find_device() yet? 2010-01-11 19:46 ` Tilman Schmidt @ 2010-01-11 20:01 ` Greg KH 2010-01-12 0:21 ` Stephen Rothwell ` (4 more replies) 0 siblings, 5 replies; 27+ messages in thread From: Greg KH @ 2010-01-11 20:01 UTC (permalink / raw) To: Tilman Schmidt; +Cc: Stephen Rothwell, LKML, netdev, Karsten Keil, isdn4linux On Mon, Jan 11, 2010 at 08:46:50PM +0100, Tilman Schmidt wrote: > Am 08.01.2010 05:46 schrieb Greg KH: > > On Fri, Jan 08, 2010 at 11:22:36AM +1100, Stephen Rothwell wrote: > >> > >> This interface has been deprecated since November 2006, so can something > >> be done about the last users (I think only some ISDN drivers)? > > That would be the HiSax I4L drivers. > > > Ick, the "new" isdn drivers are still not merged that replace those > > older ones? I thought that happened a while ago. > > mISDN, which is the designated successor to HiSax, has indeed been > merged in 2008. > > Trouble is, mISDN's userspace interface is completely different from I4L. > Removing HiSax would therefore break userspace compatibility for current > users of HiSax supported devices. In order to switch to mISDN they'll > have to replace all of their ISDN4Linux applications with equivalent > mISDN ones, and I'm not even sure there is a replacement for everything. > > Just an idea - as a stopgap measure, couldn't pci_find_device() be made > a private function of the HiSax drivers? That way, the remainder of the > kernel won't be polluted by it anymore, and the PCI_LEGACY config option > can be dropped. Something like this quick and dirty hack: Close, but if you do this, please name the function hisax_find_pci_device() or something, and change the drivers to use it instead. Also put a big fat warning in the function that calling this is unsafe for any PCI hotplug type machine. thanks, greg k-h ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: Can we remove pci_find_device() yet? 2010-01-11 20:01 ` Greg KH @ 2010-01-12 0:21 ` Stephen Rothwell 2010-01-12 0:46 ` Greg KH 2010-01-12 16:42 ` Tilman Schmidt ` (3 subsequent siblings) 4 siblings, 1 reply; 27+ messages in thread From: Stephen Rothwell @ 2010-01-12 0:21 UTC (permalink / raw) To: Greg KH; +Cc: Tilman Schmidt, LKML, netdev, Karsten Keil, isdn4linux [-- Attachment #1: Type: text/plain, Size: 558 bytes --] Hi Greg, On Mon, 11 Jan 2010 12:01:36 -0800 Greg KH <gregkh@suse.de> wrote: > > Close, but if you do this, please name the function > hisax_find_pci_device() or something, and change the drivers to use it > instead. Also put a big fat warning in the function that calling this > is unsafe for any PCI hotplug type machine. There is another implementation of pci_find_device in drivers/staging/dt3155/pci-compat.h (used by dt3155_drv.c). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --] ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: Can we remove pci_find_device() yet? 2010-01-12 0:21 ` Stephen Rothwell @ 2010-01-12 0:46 ` Greg KH 0 siblings, 0 replies; 27+ messages in thread From: Greg KH @ 2010-01-12 0:46 UTC (permalink / raw) To: Stephen Rothwell; +Cc: Tilman Schmidt, LKML, netdev, Karsten Keil, isdn4linux On Tue, Jan 12, 2010 at 11:21:15AM +1100, Stephen Rothwell wrote: > Hi Greg, > > On Mon, 11 Jan 2010 12:01:36 -0800 Greg KH <gregkh@suse.de> wrote: > > > > Close, but if you do this, please name the function > > hisax_find_pci_device() or something, and change the drivers to use it > > instead. Also put a big fat warning in the function that calling this > > is unsafe for any PCI hotplug type machine. > > There is another implementation of pci_find_device in > drivers/staging/dt3155/pci-compat.h (used by dt3155_drv.c). That file will be going away soon and the whole driver will be ported to use the "real" PCI api, so don't worry about breaking any staging drivers :) thanks, greg k-h ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: Can we remove pci_find_device() yet? 2010-01-11 20:01 ` Greg KH 2010-01-12 0:21 ` Stephen Rothwell @ 2010-01-12 16:42 ` Tilman Schmidt 2010-01-12 17:39 ` Greg KH 2010-01-12 20:34 ` Krzysztof Halasa ` (2 subsequent siblings) 4 siblings, 1 reply; 27+ messages in thread From: Tilman Schmidt @ 2010-01-12 16:42 UTC (permalink / raw) To: Greg KH; +Cc: Stephen Rothwell, LKML, netdev, Karsten Keil, isdn4linux -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2010-01-11 21:01 schrieb Greg KH: > On Mon, Jan 11, 2010 at 08:46:50PM +0100, Tilman Schmidt wrote: >> >> Just an idea - as a stopgap measure, couldn't pci_find_device() be made >> a private function of the HiSax drivers? That way, the remainder of the >> kernel won't be polluted by it anymore, and the PCI_LEGACY config option >> can be dropped. Something like this quick and dirty hack: > > Close, but if you do this, please name the function > hisax_find_pci_device() or something, and change the drivers to use it Sorry, but no. That would drag me into the checkpatch.pl swamp, a place I know well enough by now to avoid it whenever possible. Many of the calls to pci_find_device() have checkpatch problems which of course do not go away by just substituting another function name, so I would be obliged to restructure all those call sites by hand for the sake of "not introducing new code with checkpatch problems". BTDT. So I'll drop that idea. If someone else wants to pick it up, feel free to do so. Regards, Tilman - -- Tilman Schmidt E-Mail: tilman@imap.cc Bonn, Germany Diese Nachricht besteht zu 100% aus wiederverwerteten Bits. Ungeöffnet mindestens haltbar bis: (siehe Rückseite) -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.12 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAktMpmYACgkQQ3+did9BuFuJKgCggRImZ3NOTmCJUpUktreervtz fegAniAexJirz3p/AXPB6EpsCEJn3hPL =QwUB -----END PGP SIGNATURE----- ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: Can we remove pci_find_device() yet? 2010-01-12 16:42 ` Tilman Schmidt @ 2010-01-12 17:39 ` Greg KH 2010-01-13 9:02 ` Tilman Schmidt 0 siblings, 1 reply; 27+ messages in thread From: Greg KH @ 2010-01-12 17:39 UTC (permalink / raw) To: Tilman Schmidt; +Cc: Stephen Rothwell, LKML, netdev, Karsten Keil, isdn4linux On Tue, Jan 12, 2010 at 05:42:14PM +0100, Tilman Schmidt wrote: > Am 2010-01-11 21:01 schrieb Greg KH: > > On Mon, Jan 11, 2010 at 08:46:50PM +0100, Tilman Schmidt wrote: > >> > >> Just an idea - as a stopgap measure, couldn't pci_find_device() be made > >> a private function of the HiSax drivers? That way, the remainder of the > >> kernel won't be polluted by it anymore, and the PCI_LEGACY config option > >> can be dropped. Something like this quick and dirty hack: > > > > Close, but if you do this, please name the function > > hisax_find_pci_device() or something, and change the drivers to use it > > Sorry, but no. That would drag me into the checkpatch.pl swamp, > a place I know well enough by now to avoid it whenever possible. I don't understand, why? > Many of the calls to pci_find_device() have checkpatch problems > which of course do not go away by just substituting another > function name, so I would be obliged to restructure all those > call sites by hand for the sake of "not introducing new code > with checkpatch problems". BTDT. No you would not, don't be crazy. Modfying a single line to rename a function from one thing to another could never be decreed as a "don't add bad code". And if someone says it is, well, you just found someone who doesn't know what they are doing :) > So I'll drop that idea. If someone else wants to pick it up, > feel free to do so. Please continue with this idea, it's sane, and valid. thanks, greg k-h ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: Can we remove pci_find_device() yet? 2010-01-12 17:39 ` Greg KH @ 2010-01-13 9:02 ` Tilman Schmidt 0 siblings, 0 replies; 27+ messages in thread From: Tilman Schmidt @ 2010-01-13 9:02 UTC (permalink / raw) To: Greg KH; +Cc: Stephen Rothwell, LKML, netdev, Karsten Keil, isdn4linux -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2010-01-12 18:39 schrieb Greg KH: > On Tue, Jan 12, 2010 at 05:42:14PM +0100, Tilman Schmidt wrote: [...] >> Many of the calls to pci_find_device() have checkpatch problems >> which of course do not go away by just substituting another >> function name, so I would be obliged to restructure all those >> call sites by hand for the sake of "not introducing new code >> with checkpatch problems". BTDT. > > No you would not, don't be crazy. Modfying a single line to rename a > function from one thing to another could never be decreed as a "don't > add bad code". And if someone says it is, well, you just found someone > who doesn't know what they are doing :) Ok. I do hope you are right, and my extrapolation from past experience was wrong. > Please continue with this idea, it's sane, and valid. Alright, will do. Patch will follow later today, SCJ. Let's see what the checkpatch police will say. Regards, Tilman - -- Tilman Schmidt E-Mail: tilman@imap.cc Bonn, Germany Diese Nachricht besteht zu 100% aus wiederverwerteten Bits. Ungeöffnet mindestens haltbar bis: (siehe Rückseite) -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.12 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAktNjCQACgkQQ3+did9BuFsmMwCfReQ/mHQUApkpRWJZIG16PmvI vO4Anj/A4kSwddg+RZV2Uj5LVUNlsBD3 =LxhW -----END PGP SIGNATURE----- ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: Can we remove pci_find_device() yet? 2010-01-11 20:01 ` Greg KH 2010-01-12 0:21 ` Stephen Rothwell 2010-01-12 16:42 ` Tilman Schmidt @ 2010-01-12 20:34 ` Krzysztof Halasa 2010-01-12 20:53 ` Ben Hutchings 2010-01-13 14:23 ` [PATCH] pci: push deprecated pci_find_device() function to last user Tilman Schmidt 2010-01-14 10:18 ` Can we remove pci_find_device() yet? Andi Kleen 4 siblings, 1 reply; 27+ messages in thread From: Krzysztof Halasa @ 2010-01-12 20:34 UTC (permalink / raw) To: Greg KH Cc: Tilman Schmidt, Stephen Rothwell, LKML, netdev, Karsten Keil, isdn4linux Greg KH <gregkh@suse.de> writes: > Close, but if you do this, please name the function > hisax_find_pci_device() or something, and change the drivers to use it > instead. Also put a big fat warning in the function that calling this > is unsafe for any PCI hotplug type machine. BTW, I have a driver in the works which uses these functions, and I wonder how to do it correctly. The problem is that the hardware is a dual-function PCI card (two DEC Tulip Ethernet controllers) but part of the first device (EEPROM interface or something like that) is used by both (there is an FPGA connected there, serving both channels). This means drivers for dev#0 and dev#1 (both "normal" PCI controllers) need to register and access part of dev#0 BARs. How do I do that properly, in terms of PCI API? -- Krzysztof Halasa ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: Can we remove pci_find_device() yet? 2010-01-12 20:34 ` Krzysztof Halasa @ 2010-01-12 20:53 ` Ben Hutchings 2010-01-12 21:18 ` Greg KH 0 siblings, 1 reply; 27+ messages in thread From: Ben Hutchings @ 2010-01-12 20:53 UTC (permalink / raw) To: Krzysztof Halasa Cc: Greg KH, Tilman Schmidt, Stephen Rothwell, LKML, netdev, Karsten Keil, isdn4linux On Tue, 2010-01-12 at 21:34 +0100, Krzysztof Halasa wrote: > Greg KH <gregkh@suse.de> writes: > > > Close, but if you do this, please name the function > > hisax_find_pci_device() or something, and change the drivers to use it > > instead. Also put a big fat warning in the function that calling this > > is unsafe for any PCI hotplug type machine. > > BTW, I have a driver in the works which uses these functions, and I > wonder how to do it correctly. The problem is that the hardware is a > dual-function PCI card (two DEC Tulip Ethernet controllers) but part of > the first device (EEPROM interface or something like that) is used by > both (there is an FPGA connected there, serving both channels). > > This means drivers for dev#0 and dev#1 (both "normal" PCI controllers) > need to register and access part of dev#0 BARs. I hope you realise that this is a design error! Linux is fairly forgiving and allows PCI drivers to do unusual things, but other OSes make it hard or impossible for PCI drivers to coordinate multiple functions. > How do I do that properly, in terms of PCI API? One of our older controllers had a similar design error in that the two functions would sometimes have to be reset together. The way we look for the second function is: dev = pci_dev_get(dev1); while ((dev = pci_get_device(vendor_id, device_id, dev))) { if (dev->bus == dev1->bus && dev->devfn == dev1->devfn + 1) { dev2 = dev; break; } } I assume this is 'properly' since no-one has told me otherwise. Ben. -- Ben Hutchings, Senior Software Engineer, Solarflare Communications Not speaking for my employer; that's the marketing department's job. They asked us to note that Solarflare product names are trademarked. ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: Can we remove pci_find_device() yet? 2010-01-12 20:53 ` Ben Hutchings @ 2010-01-12 21:18 ` Greg KH 2010-01-13 15:09 ` Krzysztof Halasa 0 siblings, 1 reply; 27+ messages in thread From: Greg KH @ 2010-01-12 21:18 UTC (permalink / raw) To: Ben Hutchings Cc: Krzysztof Halasa, Tilman Schmidt, Stephen Rothwell, LKML, netdev, Karsten Keil, isdn4linux On Tue, Jan 12, 2010 at 08:53:25PM +0000, Ben Hutchings wrote: > > How do I do that properly, in terms of PCI API? > > One of our older controllers had a similar design error in that the two > functions would sometimes have to be reset together. The way we look > for the second function is: > > dev = pci_dev_get(dev1); > while ((dev = pci_get_device(vendor_id, device_id, dev))) { > if (dev->bus == dev1->bus && > dev->devfn == dev1->devfn + 1) { > dev2 = dev; > break; > } > } > > I assume this is 'properly' since no-one has told me otherwise. As of right now, yes, this is the "correct" way to do this. I need to dig up the "let multiple drivers bind to a single device" patch set to make this not necessary in the future. thanks, greg k-h ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: Can we remove pci_find_device() yet? 2010-01-12 21:18 ` Greg KH @ 2010-01-13 15:09 ` Krzysztof Halasa 0 siblings, 0 replies; 27+ messages in thread From: Krzysztof Halasa @ 2010-01-13 15:09 UTC (permalink / raw) To: Greg KH Cc: Ben Hutchings, Tilman Schmidt, Stephen Rothwell, LKML, netdev, Karsten Keil, isdn4linux Greg KH <gregkh@suse.de> writes: >> One of our older controllers had a similar design error in that the two >> functions would sometimes have to be reset together. The way we look >> for the second function is: >> >> dev = pci_dev_get(dev1); >> while ((dev = pci_get_device(vendor_id, device_id, dev))) { >> if (dev->bus == dev1->bus && >> dev->devfn == dev1->devfn + 1) { >> dev2 = dev; >> break; >> } >> } >> >> I assume this is 'properly' since no-one has told me otherwise. > > As of right now, yes, this is the "correct" way to do this. > > I need to dig up the "let multiple drivers bind to a single device" > patch set to make this not necessary in the future. Ben and Greg, thanks. -- Krzysztof Halasa ^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH] pci: push deprecated pci_find_device() function to last user 2010-01-11 20:01 ` Greg KH ` (2 preceding siblings ...) 2010-01-12 20:34 ` Krzysztof Halasa @ 2010-01-13 14:23 ` Tilman Schmidt 2010-01-14 4:33 ` David Miller 2010-01-14 10:18 ` Can we remove pci_find_device() yet? Andi Kleen 4 siblings, 1 reply; 27+ messages in thread From: Tilman Schmidt @ 2010-01-13 14:23 UTC (permalink / raw) To: Greg KH; +Cc: Stephen Rothwell, LKML, netdev, Karsten Keil, isdn4linux The ISDN4Linux HiSax driver family contains the last remaining users of the deprecated pci_find_device() function. This patch creates a private copy of that function in HiSax, and removes the now unused global function together with its controlling configuration option, CONFIG_PCI_LEGACY. Impact: code reorganization, no functional change Signed-off-by: Tilman Schmidt <tilman@imap.cc> --- Note: This patch is not, nor does it intend to be, checkpatch.pl clean. The issues checkpatch.pl reports on it were already present before, and are unrelated to the topic of this patch. drivers/isdn/hisax/Kconfig | 18 +++++++++--------- drivers/isdn/hisax/avm_pci.c | 13 +------------ drivers/isdn/hisax/bkm_a4t.c | 2 +- drivers/isdn/hisax/bkm_a8.c | 2 +- drivers/isdn/hisax/diva.c | 18 ++++-------------- drivers/isdn/hisax/elsa.c | 14 ++------------ drivers/isdn/hisax/enternow_pci.c | 2 +- drivers/isdn/hisax/gazel.c | 10 +--------- drivers/isdn/hisax/hfc_pci.c | 2 +- drivers/isdn/hisax/hisax.h | 23 +++++++++++++++++++++++ drivers/isdn/hisax/niccy.c | 8 +------- drivers/isdn/hisax/nj_s.c | 2 +- drivers/isdn/hisax/nj_u.c | 2 +- drivers/isdn/hisax/sedlbauer.c | 13 +------------ drivers/isdn/hisax/telespci.c | 2 +- drivers/isdn/hisax/w6692.c | 2 +- drivers/pci/Kconfig | 11 ----------- drivers/pci/Makefile | 3 --- drivers/pci/legacy.c | 34 ---------------------------------- include/linux/pci.h | 13 ------------- 20 files changed, 50 insertions(+), 144 deletions(-) delete mode 100644 drivers/pci/legacy.c diff --git a/drivers/isdn/hisax/Kconfig b/drivers/isdn/hisax/Kconfig index 3464ebc..452fde9 100644 --- a/drivers/isdn/hisax/Kconfig +++ b/drivers/isdn/hisax/Kconfig @@ -109,7 +109,7 @@ config HISAX_16_3 config HISAX_TELESPCI bool "Teles PCI" - depends on PCI && PCI_LEGACY && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) + depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) help This enables HiSax support for the Teles PCI. See <file:Documentation/isdn/README.HiSax> on how to configure it. @@ -237,7 +237,7 @@ config HISAX_MIC config HISAX_NETJET bool "NETjet card" - depends on PCI && PCI_LEGACY && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) + depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) help This enables HiSax support for the NetJet from Traverse Technologies. @@ -248,7 +248,7 @@ config HISAX_NETJET config HISAX_NETJET_U bool "NETspider U card" - depends on PCI && PCI_LEGACY && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) + depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) help This enables HiSax support for the Netspider U interface ISDN card from Traverse Technologies. @@ -287,7 +287,7 @@ config HISAX_HSTSAPHIR config HISAX_BKM_A4T bool "Telekom A4T card" - depends on PCI && PCI_LEGACY + depends on PCI help This enables HiSax support for the Telekom A4T card. @@ -297,7 +297,7 @@ config HISAX_BKM_A4T config HISAX_SCT_QUADRO bool "Scitel Quadro card" - depends on PCI && PCI_LEGACY + depends on PCI help This enables HiSax support for the Scitel Quadro card. @@ -316,7 +316,7 @@ config HISAX_GAZEL config HISAX_HFC_PCI bool "HFC PCI-Bus cards" - depends on PCI && PCI_LEGACY && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) + depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) help This enables HiSax support for the HFC-S PCI 2BDS0 based cards. @@ -325,7 +325,7 @@ config HISAX_HFC_PCI config HISAX_W6692 bool "Winbond W6692 based cards" - depends on PCI && PCI_LEGACY + depends on PCI help This enables HiSax support for Winbond W6692 based PCI ISDN cards. @@ -341,7 +341,7 @@ config HISAX_HFC_SX config HISAX_ENTERNOW_PCI bool "Formula-n enter:now PCI card" - depends on HISAX_NETJET && PCI && PCI_LEGACY && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) + depends on HISAX_NETJET && PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) help This enables HiSax support for the Formula-n enter:now PCI ISDN card. @@ -412,7 +412,7 @@ config HISAX_HFC4S8S config HISAX_FRITZ_PCIPNP tristate "AVM Fritz!Card PCI/PCIv2/PnP support (EXPERIMENTAL)" - depends on PCI && PCI_LEGACY && EXPERIMENTAL + depends on PCI && EXPERIMENTAL help This enables the driver for the AVM Fritz!Card PCI, Fritz!Card PCI v2 and Fritz!Card PnP. diff --git a/drivers/isdn/hisax/avm_pci.c b/drivers/isdn/hisax/avm_pci.c index 7cabc5a..e1563a6 100644 --- a/drivers/isdn/hisax/avm_pci.c +++ b/drivers/isdn/hisax/avm_pci.c @@ -822,20 +822,11 @@ static int __devinit avm_pnp_setup(struct IsdnCardState *cs) #endif /* __ISAPNP__ */ -#ifndef CONFIG_PCI_LEGACY - -static int __devinit avm_pci_setup(struct IsdnCardState *cs) -{ - return(1); /* no-op: success */ -} - -#else - static struct pci_dev *dev_avm __devinitdata = NULL; static int __devinit avm_pci_setup(struct IsdnCardState *cs) { - if ((dev_avm = pci_find_device(PCI_VENDOR_ID_AVM, + if ((dev_avm = hisax_find_pci_device(PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_A1, dev_avm))) { if (pci_enable_device(dev_avm)) @@ -864,8 +855,6 @@ static int __devinit avm_pci_setup(struct IsdnCardState *cs) return (1); } -#endif /* CONFIG_PCI_LEGACY */ - int __devinit setup_avm_pcipnp(struct IsdnCard *card) { diff --git a/drivers/isdn/hisax/bkm_a4t.c b/drivers/isdn/hisax/bkm_a4t.c index 9ca2ee5..9f2009c 100644 --- a/drivers/isdn/hisax/bkm_a4t.c +++ b/drivers/isdn/hisax/bkm_a4t.c @@ -340,7 +340,7 @@ setup_bkm_a4t(struct IsdnCard *card) } else return (0); - while ((dev_a4t = pci_find_device(PCI_VENDOR_ID_ZORAN, + while ((dev_a4t = hisax_find_pci_device(PCI_VENDOR_ID_ZORAN, PCI_DEVICE_ID_ZORAN_36120, dev_a4t))) { ret = a4t_pci_probe(dev_a4t, cs, &found, &pci_memaddr); if (!ret) diff --git a/drivers/isdn/hisax/bkm_a8.c b/drivers/isdn/hisax/bkm_a8.c index e1ff471..e775706 100644 --- a/drivers/isdn/hisax/bkm_a8.c +++ b/drivers/isdn/hisax/bkm_a8.c @@ -301,7 +301,7 @@ setup_sct_quadro(struct IsdnCard *card) (sub_vendor_id != PCI_VENDOR_ID_BERKOM))) return (0); if (cs->subtyp == SCT_1) { - while ((dev_a8 = pci_find_device(PCI_VENDOR_ID_PLX, + while ((dev_a8 = hisax_find_pci_device(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, dev_a8))) { sub_vendor_id = dev_a8->subsystem_vendor; diff --git a/drivers/isdn/hisax/diva.c b/drivers/isdn/hisax/diva.c index 0b0c2e5..dd51ad4 100644 --- a/drivers/isdn/hisax/diva.c +++ b/drivers/isdn/hisax/diva.c @@ -1148,7 +1148,6 @@ static int __devinit setup_diva_isapnp(struct IsdnCard *card) #endif /* ISAPNP */ -#ifdef CONFIG_PCI_LEGACY static struct pci_dev *dev_diva __devinitdata = NULL; static struct pci_dev *dev_diva_u __devinitdata = NULL; static struct pci_dev *dev_diva201 __devinitdata = NULL; @@ -1159,21 +1158,21 @@ static int __devinit setup_diva_pci(struct IsdnCard *card) struct IsdnCardState *cs = card->cs; cs->subtyp = 0; - if ((dev_diva = pci_find_device(PCI_VENDOR_ID_EICON, + if ((dev_diva = hisax_find_pci_device(PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA20, dev_diva))) { if (pci_enable_device(dev_diva)) return(0); cs->subtyp = DIVA_PCI; cs->irq = dev_diva->irq; cs->hw.diva.cfg_reg = pci_resource_start(dev_diva, 2); - } else if ((dev_diva_u = pci_find_device(PCI_VENDOR_ID_EICON, + } else if ((dev_diva_u = hisax_find_pci_device(PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA20_U, dev_diva_u))) { if (pci_enable_device(dev_diva_u)) return(0); cs->subtyp = DIVA_PCI; cs->irq = dev_diva_u->irq; cs->hw.diva.cfg_reg = pci_resource_start(dev_diva_u, 2); - } else if ((dev_diva201 = pci_find_device(PCI_VENDOR_ID_EICON, + } else if ((dev_diva201 = hisax_find_pci_device(PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA201, dev_diva201))) { if (pci_enable_device(dev_diva201)) return(0); @@ -1183,7 +1182,7 @@ static int __devinit setup_diva_pci(struct IsdnCard *card) (ulong) ioremap(pci_resource_start(dev_diva201, 0), 4096); cs->hw.diva.cfg_reg = (ulong) ioremap(pci_resource_start(dev_diva201, 1), 4096); - } else if ((dev_diva202 = pci_find_device(PCI_VENDOR_ID_EICON, + } else if ((dev_diva202 = hisax_find_pci_device(PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA202, dev_diva202))) { if (pci_enable_device(dev_diva202)) return(0); @@ -1229,15 +1228,6 @@ static int __devinit setup_diva_pci(struct IsdnCard *card) return (1); /* card found */ } -#else /* if !CONFIG_PCI_LEGACY */ - -static int __devinit setup_diva_pci(struct IsdnCard *card) -{ - return (-1); /* card not found; continue search */ -} - -#endif /* CONFIG_PCI_LEGACY */ - int __devinit setup_diva(struct IsdnCard *card) { diff --git a/drivers/isdn/hisax/elsa.c b/drivers/isdn/hisax/elsa.c index aa29d1c..71aa8a1 100644 --- a/drivers/isdn/hisax/elsa.c +++ b/drivers/isdn/hisax/elsa.c @@ -1025,7 +1025,6 @@ setup_elsa_pcmcia(struct IsdnCard *card) cs->irq); } -#ifdef CONFIG_PCI_LEGACY static struct pci_dev *dev_qs1000 __devinitdata = NULL; static struct pci_dev *dev_qs3000 __devinitdata = NULL; @@ -1035,7 +1034,7 @@ setup_elsa_pci(struct IsdnCard *card) struct IsdnCardState *cs = card->cs; cs->subtyp = 0; - if ((dev_qs1000 = pci_find_device(PCI_VENDOR_ID_ELSA, + if ((dev_qs1000 = hisax_find_pci_device(PCI_VENDOR_ID_ELSA, PCI_DEVICE_ID_ELSA_MICROLINK, dev_qs1000))) { if (pci_enable_device(dev_qs1000)) return(0); @@ -1043,7 +1042,7 @@ setup_elsa_pci(struct IsdnCard *card) cs->irq = dev_qs1000->irq; cs->hw.elsa.cfg = pci_resource_start(dev_qs1000, 1); cs->hw.elsa.base = pci_resource_start(dev_qs1000, 3); - } else if ((dev_qs3000 = pci_find_device(PCI_VENDOR_ID_ELSA, + } else if ((dev_qs3000 = hisax_find_pci_device(PCI_VENDOR_ID_ELSA, PCI_DEVICE_ID_ELSA_QS3000, dev_qs3000))) { if (pci_enable_device(dev_qs3000)) return(0); @@ -1086,15 +1085,6 @@ setup_elsa_pci(struct IsdnCard *card) return (1); } -#else - -static int __devinit -setup_elsa_pci(struct IsdnCard *card) -{ - return (1); -} -#endif /* CONFIG_PCI_LEGACY */ - static int __devinit setup_elsa_common(struct IsdnCard *card) { diff --git a/drivers/isdn/hisax/enternow_pci.c b/drivers/isdn/hisax/enternow_pci.c index 39f421e..26264ab 100644 --- a/drivers/isdn/hisax/enternow_pci.c +++ b/drivers/isdn/hisax/enternow_pci.c @@ -406,7 +406,7 @@ setup_enternow_pci(struct IsdnCard *card) for ( ;; ) { - if ((dev_netjet = pci_find_device(PCI_VENDOR_ID_TIGERJET, + if ((dev_netjet = hisax_find_pci_device(PCI_VENDOR_ID_TIGERJET, PCI_DEVICE_ID_TIGERJET_300, dev_netjet))) { ret = en_pci_probe(dev_netjet, cs); if (!ret) diff --git a/drivers/isdn/hisax/gazel.c b/drivers/isdn/hisax/gazel.c index 0ea3b46..8a6fd8b 100644 --- a/drivers/isdn/hisax/gazel.c +++ b/drivers/isdn/hisax/gazel.c @@ -531,7 +531,6 @@ setup_gazelisa(struct IsdnCard *card, struct IsdnCardState *cs) return (0); } -#ifdef CONFIG_PCI_LEGACY static struct pci_dev *dev_tel __devinitdata = NULL; static int __devinit @@ -546,7 +545,7 @@ setup_gazelpci(struct IsdnCardState *cs) found = 0; seekcard = PCI_DEVICE_ID_PLX_R685; for (nbseek = 0; nbseek < 4; nbseek++) { - if ((dev_tel = pci_find_device(PCI_VENDOR_ID_PLX, + if ((dev_tel = hisax_find_pci_device(PCI_VENDOR_ID_PLX, seekcard, dev_tel))) { if (pci_enable_device(dev_tel)) return 1; @@ -620,7 +619,6 @@ setup_gazelpci(struct IsdnCardState *cs) return (0); } -#endif /* CONFIG_PCI_LEGACY */ int __devinit setup_gazel(struct IsdnCard *card) @@ -639,14 +637,8 @@ setup_gazel(struct IsdnCard *card) if (setup_gazelisa(card, cs)) return (0); } else { - -#ifdef CONFIG_PCI_LEGACY if (setup_gazelpci(cs)) return (0); -#else - printk(KERN_WARNING "Gazel: Card PCI requested and NO_PCI_BIOS, unable to config\n"); - return (0); -#endif /* CONFIG_PCI */ } if (reserve_regions(card, cs)) { diff --git a/drivers/isdn/hisax/hfc_pci.c b/drivers/isdn/hisax/hfc_pci.c index 1091473..917cc84 100644 --- a/drivers/isdn/hisax/hfc_pci.c +++ b/drivers/isdn/hisax/hfc_pci.c @@ -1658,7 +1658,7 @@ setup_hfcpci(struct IsdnCard *card) i = 0; while (id_list[i].vendor_id) { - tmp_hfcpci = pci_find_device(id_list[i].vendor_id, + tmp_hfcpci = hisax_find_pci_device(id_list[i].vendor_id, id_list[i].device_id, dev_hfcpci); i++; diff --git a/drivers/isdn/hisax/hisax.h b/drivers/isdn/hisax/hisax.h index 0685c19..832a878 100644 --- a/drivers/isdn/hisax/hisax.h +++ b/drivers/isdn/hisax/hisax.h @@ -1323,3 +1323,26 @@ void release_tei(struct IsdnCardState *cs); char *HiSax_getrev(const char *revision); int TeiNew(void); void TeiFree(void); + +#ifdef CONFIG_PCI + +#include <linux/pci.h> + +/* adaptation wrapper for old usage + * WARNING! This is unfit for use in a PCI hotplug environment, + * as the returned PCI device can disappear at any moment in time. + * Callers should be converted to use pci_get_device() instead. + */ +static inline struct pci_dev *hisax_find_pci_device(unsigned int vendor, + unsigned int device, + struct pci_dev *from) +{ + struct pci_dev *pdev; + + pci_dev_get(from); + pdev = pci_get_subsys(vendor, device, PCI_ANY_ID, PCI_ANY_ID, from); + pci_dev_put(pdev); + return pdev; +} + +#endif diff --git a/drivers/isdn/hisax/niccy.c b/drivers/isdn/hisax/niccy.c index ef00633..91c4241 100644 --- a/drivers/isdn/hisax/niccy.c +++ b/drivers/isdn/hisax/niccy.c @@ -297,12 +297,11 @@ int __devinit setup_niccy(struct IsdnCard *card) return 0; } } else { -#ifdef CONFIG_PCI_LEGACY static struct pci_dev *niccy_dev __devinitdata; u_int pci_ioaddr; cs->subtyp = 0; - if ((niccy_dev = pci_find_device(PCI_VENDOR_ID_SATSAGEM, + if ((niccy_dev = hisax_find_pci_device(PCI_VENDOR_ID_SATSAGEM, PCI_DEVICE_ID_SATSAGEM_NICCY, niccy_dev))) { if (pci_enable_device(niccy_dev)) @@ -350,11 +349,6 @@ int __devinit setup_niccy(struct IsdnCard *card) release_region(cs->hw.niccy.isac, 4); return 0; } -#else - printk(KERN_WARNING "Niccy: io0 0 and NO_PCI_BIOS\n"); - printk(KERN_WARNING "Niccy: unable to config NICCY PCI\n"); - return 0; -#endif /* CONFIG_PCI_LEGACY */ } printk(KERN_INFO "HiSax: NICCY %s config irq:%d data:0x%X ale:0x%X\n", (cs->subtyp == 1) ? "PnP" : "PCI", diff --git a/drivers/isdn/hisax/nj_s.c b/drivers/isdn/hisax/nj_s.c index 8d36ccc..2344e7b 100644 --- a/drivers/isdn/hisax/nj_s.c +++ b/drivers/isdn/hisax/nj_s.c @@ -276,7 +276,7 @@ setup_netjet_s(struct IsdnCard *card) for ( ;; ) { - if ((dev_netjet = pci_find_device(PCI_VENDOR_ID_TIGERJET, + if ((dev_netjet = hisax_find_pci_device(PCI_VENDOR_ID_TIGERJET, PCI_DEVICE_ID_TIGERJET_300, dev_netjet))) { ret = njs_pci_probe(dev_netjet, cs); if (!ret) diff --git a/drivers/isdn/hisax/nj_u.c b/drivers/isdn/hisax/nj_u.c index d306c94..095e974 100644 --- a/drivers/isdn/hisax/nj_u.c +++ b/drivers/isdn/hisax/nj_u.c @@ -240,7 +240,7 @@ setup_netjet_u(struct IsdnCard *card) for ( ;; ) { - if ((dev_netjet = pci_find_device(PCI_VENDOR_ID_TIGERJET, + if ((dev_netjet = hisax_find_pci_device(PCI_VENDOR_ID_TIGERJET, PCI_DEVICE_ID_TIGERJET_300, dev_netjet))) { ret = nju_pci_probe(dev_netjet, cs); if (!ret) diff --git a/drivers/isdn/hisax/sedlbauer.c b/drivers/isdn/hisax/sedlbauer.c index 5569a52..b90abd9 100644 --- a/drivers/isdn/hisax/sedlbauer.c +++ b/drivers/isdn/hisax/sedlbauer.c @@ -598,7 +598,6 @@ setup_sedlbauer_isapnp(struct IsdnCard *card, int *bytecnt) } #endif /* __ISAPNP__ */ -#ifdef CONFIG_PCI_LEGACY static struct pci_dev *dev_sedl __devinitdata = NULL; static int __devinit @@ -607,7 +606,7 @@ setup_sedlbauer_pci(struct IsdnCard *card) struct IsdnCardState *cs = card->cs; u16 sub_vendor_id, sub_id; - if ((dev_sedl = pci_find_device(PCI_VENDOR_ID_TIGERJET, + if ((dev_sedl = hisax_find_pci_device(PCI_VENDOR_ID_TIGERJET, PCI_DEVICE_ID_TIGERJET_100, dev_sedl))) { if (pci_enable_device(dev_sedl)) return(0); @@ -665,16 +664,6 @@ setup_sedlbauer_pci(struct IsdnCard *card) return (1); } -#else - -static int __devinit -setup_sedlbauer_pci(struct IsdnCard *card) -{ - return (1); -} - -#endif /* CONFIG_PCI_LEGACY */ - int __devinit setup_sedlbauer(struct IsdnCard *card) { diff --git a/drivers/isdn/hisax/telespci.c b/drivers/isdn/hisax/telespci.c index 28b08de..b85ceb3 100644 --- a/drivers/isdn/hisax/telespci.c +++ b/drivers/isdn/hisax/telespci.c @@ -300,7 +300,7 @@ setup_telespci(struct IsdnCard *card) if (cs->typ != ISDN_CTYPE_TELESPCI) return (0); - if ((dev_tel = pci_find_device (PCI_VENDOR_ID_ZORAN, PCI_DEVICE_ID_ZORAN_36120, dev_tel))) { + if ((dev_tel = hisax_find_pci_device (PCI_VENDOR_ID_ZORAN, PCI_DEVICE_ID_ZORAN_36120, dev_tel))) { if (pci_enable_device(dev_tel)) return(0); cs->irq = dev_tel->irq; diff --git a/drivers/isdn/hisax/w6692.c b/drivers/isdn/hisax/w6692.c index c4d862c..9d6e864 100644 --- a/drivers/isdn/hisax/w6692.c +++ b/drivers/isdn/hisax/w6692.c @@ -1007,7 +1007,7 @@ setup_w6692(struct IsdnCard *card) return (0); while (id_list[id_idx].vendor_id) { - dev_w6692 = pci_find_device(id_list[id_idx].vendor_id, + dev_w6692 = hisax_find_pci_device(id_list[id_idx].vendor_id, id_list[id_idx].device_id, dev_w6692); if (dev_w6692) { diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig index b1ecefa..7858a11 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig @@ -21,17 +21,6 @@ config PCI_MSI If you don't know what to do here, say N. -config PCI_LEGACY - bool "Enable deprecated pci_find_* API" - depends on PCI - default y - help - Say Y here if you want to include support for the deprecated - pci_find_device() API. Most drivers have been converted over - to using the proper hotplug APIs, so this option serves to - include/exclude only a few drivers that are still using this - API. - config PCI_DEBUG bool "PCI Debugging" depends on PCI && DEBUG_KERNEL diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile index 4df48d5..f635608 100644 --- a/drivers/pci/Makefile +++ b/drivers/pci/Makefile @@ -8,9 +8,6 @@ obj-y += access.o bus.o probe.o remove.o pci.o quirks.o \ obj-$(CONFIG_PROC_FS) += proc.o obj-$(CONFIG_SYSFS) += slot.o -obj-$(CONFIG_PCI_LEGACY) += legacy.o -CFLAGS_legacy.o += -Wno-deprecated-declarations - # Build PCI Express stuff if needed obj-$(CONFIG_PCIEPORTBUS) += pcie/ diff --git a/drivers/pci/legacy.c b/drivers/pci/legacy.c deleted file mode 100644 index 871f65c..0000000 --- a/drivers/pci/legacy.c +++ /dev/null @@ -1,34 +0,0 @@ -#include <linux/init.h> -#include <linux/pci.h> -#include <linux/module.h> -#include <linux/interrupt.h> -#include "pci.h" - -/** - * pci_find_device - begin or continue searching for a PCI device by vendor/device id - * @vendor: PCI vendor id to match, or %PCI_ANY_ID to match all vendor ids - * @device: PCI device id to match, or %PCI_ANY_ID to match all device ids - * @from: Previous PCI device found in search, or %NULL for new search. - * - * Iterates through the list of known PCI devices. If a PCI device is found - * with a matching @vendor and @device, a pointer to its device structure is - * returned. Otherwise, %NULL is returned. - * A new search is initiated by passing %NULL as the @from argument. - * Otherwise if @from is not %NULL, searches continue from next device - * on the global list. - * - * NOTE: Do not use this function any more; use pci_get_device() instead, as - * the PCI device returned by this function can disappear at any moment in - * time. - */ -struct pci_dev *pci_find_device(unsigned int vendor, unsigned int device, - struct pci_dev *from) -{ - struct pci_dev *pdev; - - pci_dev_get(from); - pdev = pci_get_subsys(vendor, device, PCI_ANY_ID, PCI_ANY_ID, from); - pci_dev_put(pdev); - return pdev; -} -EXPORT_SYMBOL(pci_find_device); diff --git a/include/linux/pci.h b/include/linux/pci.h index 174e539..dd9682c 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -615,12 +615,6 @@ extern void pci_sort_breadthfirst(void); /* Generic PCI functions exported to card drivers */ -#ifdef CONFIG_PCI_LEGACY -struct pci_dev __deprecated *pci_find_device(unsigned int vendor, - unsigned int device, - struct pci_dev *from); -#endif /* CONFIG_PCI_LEGACY */ - enum pci_lost_interrupt_reason { PCI_LOST_IRQ_NO_INFORMATION = 0, PCI_LOST_IRQ_DISABLE_MSI, @@ -973,13 +967,6 @@ static inline int pci_proc_domain(struct pci_bus *bus) _PCI_NOP_ALL(read, *) _PCI_NOP_ALL(write,) -static inline struct pci_dev *pci_find_device(unsigned int vendor, - unsigned int device, - struct pci_dev *from) -{ - return NULL; -} - static inline struct pci_dev *pci_get_device(unsigned int vendor, unsigned int device, struct pci_dev *from) -- 1.6.5.3.298.g39add ^ permalink raw reply related [flat|nested] 27+ messages in thread
* Re: [PATCH] pci: push deprecated pci_find_device() function to last user 2010-01-13 14:23 ` [PATCH] pci: push deprecated pci_find_device() function to last user Tilman Schmidt @ 2010-01-14 4:33 ` David Miller 2010-01-14 4:43 ` Greg KH 0 siblings, 1 reply; 27+ messages in thread From: David Miller @ 2010-01-14 4:33 UTC (permalink / raw) To: tilman; +Cc: gregkh, sfr, linux-kernel, netdev, isdn, isdn4linux From: Tilman Schmidt <tilman@imap.cc> Date: Wed, 13 Jan 2010 15:23:28 +0100 (CET) > The ISDN4Linux HiSax driver family contains the last remaining users > of the deprecated pci_find_device() function. This patch creates a > private copy of that function in HiSax, and removes the now unused > global function together with its controlling configuration option, > CONFIG_PCI_LEGACY. > > Impact: code reorganization, no functional change > Signed-off-by: Tilman Schmidt <tilman@imap.cc> > --- > Note: This patch is not, nor does it intend to be, checkpatch.pl clean. > The issues checkpatch.pl reports on it were already present before, and > are unrelated to the topic of this patch. I'm fine with this, and Greg or whoever else can take this through a driver or PCI specific tree if they want: Acked-by: David S. Miller <davem@davemloft.net> ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH] pci: push deprecated pci_find_device() function to last user 2010-01-14 4:33 ` David Miller @ 2010-01-14 4:43 ` Greg KH 2010-01-14 8:12 ` David Miller 0 siblings, 1 reply; 27+ messages in thread From: Greg KH @ 2010-01-14 4:43 UTC (permalink / raw) To: David Miller; +Cc: tilman, sfr, linux-kernel, netdev, isdn, isdn4linux On Wed, Jan 13, 2010 at 08:33:38PM -0800, David Miller wrote: > From: Tilman Schmidt <tilman@imap.cc> > Date: Wed, 13 Jan 2010 15:23:28 +0100 (CET) > > > The ISDN4Linux HiSax driver family contains the last remaining users > > of the deprecated pci_find_device() function. This patch creates a > > private copy of that function in HiSax, and removes the now unused > > global function together with its controlling configuration option, > > CONFIG_PCI_LEGACY. > > > > Impact: code reorganization, no functional change > > Signed-off-by: Tilman Schmidt <tilman@imap.cc> > > --- > > Note: This patch is not, nor does it intend to be, checkpatch.pl clean. > > The issues checkpatch.pl reports on it were already present before, and > > are unrelated to the topic of this patch. > > I'm fine with this, and Greg or whoever else can take this > through a driver or PCI specific tree if they want: > > Acked-by: David S. Miller <davem@davemloft.net> Where do ISDN patches go through, the network tree? Acked-by: Greg Kroah-Hartman <gregkh@suse.de> ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH] pci: push deprecated pci_find_device() function to last user 2010-01-14 4:43 ` Greg KH @ 2010-01-14 8:12 ` David Miller 2010-01-14 16:28 ` Jesse Barnes 0 siblings, 1 reply; 27+ messages in thread From: David Miller @ 2010-01-14 8:12 UTC (permalink / raw) To: gregkh; +Cc: tilman, sfr, linux-kernel, netdev, isdn, isdn4linux From: Greg KH <gregkh@suse.de> Date: Wed, 13 Jan 2010 20:43:31 -0800 > On Wed, Jan 13, 2010 at 08:33:38PM -0800, David Miller wrote: >> From: Tilman Schmidt <tilman@imap.cc> >> Date: Wed, 13 Jan 2010 15:23:28 +0100 (CET) >> >> > The ISDN4Linux HiSax driver family contains the last remaining users >> > of the deprecated pci_find_device() function. This patch creates a >> > private copy of that function in HiSax, and removes the now unused >> > global function together with its controlling configuration option, >> > CONFIG_PCI_LEGACY. >> > >> > Impact: code reorganization, no functional change >> > Signed-off-by: Tilman Schmidt <tilman@imap.cc> >> > --- >> > Note: This patch is not, nor does it intend to be, checkpatch.pl clean. >> > The issues checkpatch.pl reports on it were already present before, and >> > are unrelated to the topic of this patch. >> >> I'm fine with this, and Greg or whoever else can take this >> through a driver or PCI specific tree if they want: >> >> Acked-by: David S. Miller <davem@davemloft.net> > > Where do ISDN patches go through, the network tree? > > Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Yeah usually, but I thought the PCI tree might want this one because it tosses things from drivers/pci ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH] pci: push deprecated pci_find_device() function to last user 2010-01-14 8:12 ` David Miller @ 2010-01-14 16:28 ` Jesse Barnes 2010-01-14 22:18 ` [PATCH/REPOST] " Tilman Schmidt 2010-01-18 16:24 ` [PATCH/v2] " Tilman Schmidt 0 siblings, 2 replies; 27+ messages in thread From: Jesse Barnes @ 2010-01-14 16:28 UTC (permalink / raw) To: David Miller; +Cc: gregkh, tilman, sfr, linux-kernel, netdev, isdn, isdn4linux On Thu, 14 Jan 2010 00:12:04 -0800 (PST) David Miller <davem@davemloft.net> wrote: > From: Greg KH <gregkh@suse.de> > Date: Wed, 13 Jan 2010 20:43:31 -0800 > > > On Wed, Jan 13, 2010 at 08:33:38PM -0800, David Miller wrote: > >> From: Tilman Schmidt <tilman@imap.cc> > >> Date: Wed, 13 Jan 2010 15:23:28 +0100 (CET) > >> > >> > The ISDN4Linux HiSax driver family contains the last remaining > >> > users of the deprecated pci_find_device() function. This patch > >> > creates a private copy of that function in HiSax, and removes > >> > the now unused global function together with its controlling > >> > configuration option, CONFIG_PCI_LEGACY. > >> > > >> > Impact: code reorganization, no functional change > >> > Signed-off-by: Tilman Schmidt <tilman@imap.cc> > >> > --- > >> > Note: This patch is not, nor does it intend to be, checkpatch.pl > >> > clean. The issues checkpatch.pl reports on it were already > >> > present before, and are unrelated to the topic of this patch. > >> > >> I'm fine with this, and Greg or whoever else can take this > >> through a driver or PCI specific tree if they want: > >> > >> Acked-by: David S. Miller <davem@davemloft.net> > > > > Where do ISDN patches go through, the network tree? > > > > Acked-by: Greg Kroah-Hartman <gregkh@suse.de> > > Yeah usually, but I thought the PCI tree might want this one > because it tosses things from drivers/pci I can take it, but I lost the original patch. Tilman, can you resend? Thanks, -- Jesse Barnes, Intel Open Source Technology Center ^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH/REPOST] pci: push deprecated pci_find_device() function to last user 2010-01-14 16:28 ` Jesse Barnes @ 2010-01-14 22:18 ` Tilman Schmidt 2010-01-15 18:08 ` Jesse Barnes 2010-01-18 16:24 ` [PATCH/v2] " Tilman Schmidt 1 sibling, 1 reply; 27+ messages in thread From: Tilman Schmidt @ 2010-01-14 22:18 UTC (permalink / raw) To: Jesse Barnes Cc: David Miller, Greg KH, Stephen Rothwell, LKML, netdev, Karsten Keil, isdn4linux Am 14.01.2010 17:28 schrieb Jesse Barnes: > I can take it, but I lost the original patch. Tilman, can you resend? Sure, here you are: Subject: [PATCH] pci: push deprecated pci_find_device() function to last user The ISDN4Linux HiSax driver family contains the last remaining users of the deprecated pci_find_device() function. This patch creates a private copy of that function in HiSax, and removes the now unused global function together with its controlling configuration option, CONFIG_PCI_LEGACY. Impact: code reorganization, no functional change Signed-off-by: Tilman Schmidt <tilman@imap.cc> --- Note: This patch is not, nor does it intend to be, checkpatch.pl clean. The issues checkpatch.pl reports on it were already present before, and are unrelated to the topic of this patch. drivers/isdn/hisax/Kconfig | 18 +++++++++--------- drivers/isdn/hisax/avm_pci.c | 13 +------------ drivers/isdn/hisax/bkm_a4t.c | 2 +- drivers/isdn/hisax/bkm_a8.c | 2 +- drivers/isdn/hisax/diva.c | 18 ++++-------------- drivers/isdn/hisax/elsa.c | 14 ++------------ drivers/isdn/hisax/enternow_pci.c | 2 +- drivers/isdn/hisax/gazel.c | 10 +--------- drivers/isdn/hisax/hfc_pci.c | 2 +- drivers/isdn/hisax/hisax.h | 23 +++++++++++++++++++++++ drivers/isdn/hisax/niccy.c | 8 +------- drivers/isdn/hisax/nj_s.c | 2 +- drivers/isdn/hisax/nj_u.c | 2 +- drivers/isdn/hisax/sedlbauer.c | 13 +------------ drivers/isdn/hisax/telespci.c | 2 +- drivers/isdn/hisax/w6692.c | 2 +- drivers/pci/Kconfig | 11 ----------- drivers/pci/Makefile | 3 --- drivers/pci/legacy.c | 34 ---------------------------------- include/linux/pci.h | 13 ------------- 20 files changed, 50 insertions(+), 144 deletions(-) delete mode 100644 drivers/pci/legacy.c diff --git a/drivers/isdn/hisax/Kconfig b/drivers/isdn/hisax/Kconfig index 3464ebc..452fde9 100644 --- a/drivers/isdn/hisax/Kconfig +++ b/drivers/isdn/hisax/Kconfig @@ -109,7 +109,7 @@ config HISAX_16_3 config HISAX_TELESPCI bool "Teles PCI" - depends on PCI && PCI_LEGACY && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) + depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) help This enables HiSax support for the Teles PCI. See <file:Documentation/isdn/README.HiSax> on how to configure it. @@ -237,7 +237,7 @@ config HISAX_MIC config HISAX_NETJET bool "NETjet card" - depends on PCI && PCI_LEGACY && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) + depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) help This enables HiSax support for the NetJet from Traverse Technologies. @@ -248,7 +248,7 @@ config HISAX_NETJET config HISAX_NETJET_U bool "NETspider U card" - depends on PCI && PCI_LEGACY && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) + depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) help This enables HiSax support for the Netspider U interface ISDN card from Traverse Technologies. @@ -287,7 +287,7 @@ config HISAX_HSTSAPHIR config HISAX_BKM_A4T bool "Telekom A4T card" - depends on PCI && PCI_LEGACY + depends on PCI help This enables HiSax support for the Telekom A4T card. @@ -297,7 +297,7 @@ config HISAX_BKM_A4T config HISAX_SCT_QUADRO bool "Scitel Quadro card" - depends on PCI && PCI_LEGACY + depends on PCI help This enables HiSax support for the Scitel Quadro card. @@ -316,7 +316,7 @@ config HISAX_GAZEL config HISAX_HFC_PCI bool "HFC PCI-Bus cards" - depends on PCI && PCI_LEGACY && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) + depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) help This enables HiSax support for the HFC-S PCI 2BDS0 based cards. @@ -325,7 +325,7 @@ config HISAX_HFC_PCI config HISAX_W6692 bool "Winbond W6692 based cards" - depends on PCI && PCI_LEGACY + depends on PCI help This enables HiSax support for Winbond W6692 based PCI ISDN cards. @@ -341,7 +341,7 @@ config HISAX_HFC_SX config HISAX_ENTERNOW_PCI bool "Formula-n enter:now PCI card" - depends on HISAX_NETJET && PCI && PCI_LEGACY && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) + depends on HISAX_NETJET && PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) help This enables HiSax support for the Formula-n enter:now PCI ISDN card. @@ -412,7 +412,7 @@ config HISAX_HFC4S8S config HISAX_FRITZ_PCIPNP tristate "AVM Fritz!Card PCI/PCIv2/PnP support (EXPERIMENTAL)" - depends on PCI && PCI_LEGACY && EXPERIMENTAL + depends on PCI && EXPERIMENTAL help This enables the driver for the AVM Fritz!Card PCI, Fritz!Card PCI v2 and Fritz!Card PnP. diff --git a/drivers/isdn/hisax/avm_pci.c b/drivers/isdn/hisax/avm_pci.c index 7cabc5a..e1563a6 100644 --- a/drivers/isdn/hisax/avm_pci.c +++ b/drivers/isdn/hisax/avm_pci.c @@ -822,20 +822,11 @@ static int __devinit avm_pnp_setup(struct IsdnCardState *cs) #endif /* __ISAPNP__ */ -#ifndef CONFIG_PCI_LEGACY - -static int __devinit avm_pci_setup(struct IsdnCardState *cs) -{ - return(1); /* no-op: success */ -} - -#else - static struct pci_dev *dev_avm __devinitdata = NULL; static int __devinit avm_pci_setup(struct IsdnCardState *cs) { - if ((dev_avm = pci_find_device(PCI_VENDOR_ID_AVM, + if ((dev_avm = hisax_find_pci_device(PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_A1, dev_avm))) { if (pci_enable_device(dev_avm)) @@ -864,8 +855,6 @@ static int __devinit avm_pci_setup(struct IsdnCardState *cs) return (1); } -#endif /* CONFIG_PCI_LEGACY */ - int __devinit setup_avm_pcipnp(struct IsdnCard *card) { diff --git a/drivers/isdn/hisax/bkm_a4t.c b/drivers/isdn/hisax/bkm_a4t.c index 9ca2ee5..9f2009c 100644 --- a/drivers/isdn/hisax/bkm_a4t.c +++ b/drivers/isdn/hisax/bkm_a4t.c @@ -340,7 +340,7 @@ setup_bkm_a4t(struct IsdnCard *card) } else return (0); - while ((dev_a4t = pci_find_device(PCI_VENDOR_ID_ZORAN, + while ((dev_a4t = hisax_find_pci_device(PCI_VENDOR_ID_ZORAN, PCI_DEVICE_ID_ZORAN_36120, dev_a4t))) { ret = a4t_pci_probe(dev_a4t, cs, &found, &pci_memaddr); if (!ret) diff --git a/drivers/isdn/hisax/bkm_a8.c b/drivers/isdn/hisax/bkm_a8.c index e1ff471..e775706 100644 --- a/drivers/isdn/hisax/bkm_a8.c +++ b/drivers/isdn/hisax/bkm_a8.c @@ -301,7 +301,7 @@ setup_sct_quadro(struct IsdnCard *card) (sub_vendor_id != PCI_VENDOR_ID_BERKOM))) return (0); if (cs->subtyp == SCT_1) { - while ((dev_a8 = pci_find_device(PCI_VENDOR_ID_PLX, + while ((dev_a8 = hisax_find_pci_device(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, dev_a8))) { sub_vendor_id = dev_a8->subsystem_vendor; diff --git a/drivers/isdn/hisax/diva.c b/drivers/isdn/hisax/diva.c index 0b0c2e5..dd51ad4 100644 --- a/drivers/isdn/hisax/diva.c +++ b/drivers/isdn/hisax/diva.c @@ -1148,7 +1148,6 @@ static int __devinit setup_diva_isapnp(struct IsdnCard *card) #endif /* ISAPNP */ -#ifdef CONFIG_PCI_LEGACY static struct pci_dev *dev_diva __devinitdata = NULL; static struct pci_dev *dev_diva_u __devinitdata = NULL; static struct pci_dev *dev_diva201 __devinitdata = NULL; @@ -1159,21 +1158,21 @@ static int __devinit setup_diva_pci(struct IsdnCard *card) struct IsdnCardState *cs = card->cs; cs->subtyp = 0; - if ((dev_diva = pci_find_device(PCI_VENDOR_ID_EICON, + if ((dev_diva = hisax_find_pci_device(PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA20, dev_diva))) { if (pci_enable_device(dev_diva)) return(0); cs->subtyp = DIVA_PCI; cs->irq = dev_diva->irq; cs->hw.diva.cfg_reg = pci_resource_start(dev_diva, 2); - } else if ((dev_diva_u = pci_find_device(PCI_VENDOR_ID_EICON, + } else if ((dev_diva_u = hisax_find_pci_device(PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA20_U, dev_diva_u))) { if (pci_enable_device(dev_diva_u)) return(0); cs->subtyp = DIVA_PCI; cs->irq = dev_diva_u->irq; cs->hw.diva.cfg_reg = pci_resource_start(dev_diva_u, 2); - } else if ((dev_diva201 = pci_find_device(PCI_VENDOR_ID_EICON, + } else if ((dev_diva201 = hisax_find_pci_device(PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA201, dev_diva201))) { if (pci_enable_device(dev_diva201)) return(0); @@ -1183,7 +1182,7 @@ static int __devinit setup_diva_pci(struct IsdnCard *card) (ulong) ioremap(pci_resource_start(dev_diva201, 0), 4096); cs->hw.diva.cfg_reg = (ulong) ioremap(pci_resource_start(dev_diva201, 1), 4096); - } else if ((dev_diva202 = pci_find_device(PCI_VENDOR_ID_EICON, + } else if ((dev_diva202 = hisax_find_pci_device(PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA202, dev_diva202))) { if (pci_enable_device(dev_diva202)) return(0); @@ -1229,15 +1228,6 @@ static int __devinit setup_diva_pci(struct IsdnCard *card) return (1); /* card found */ } -#else /* if !CONFIG_PCI_LEGACY */ - -static int __devinit setup_diva_pci(struct IsdnCard *card) -{ - return (-1); /* card not found; continue search */ -} - -#endif /* CONFIG_PCI_LEGACY */ - int __devinit setup_diva(struct IsdnCard *card) { diff --git a/drivers/isdn/hisax/elsa.c b/drivers/isdn/hisax/elsa.c index aa29d1c..71aa8a1 100644 --- a/drivers/isdn/hisax/elsa.c +++ b/drivers/isdn/hisax/elsa.c @@ -1025,7 +1025,6 @@ setup_elsa_pcmcia(struct IsdnCard *card) cs->irq); } -#ifdef CONFIG_PCI_LEGACY static struct pci_dev *dev_qs1000 __devinitdata = NULL; static struct pci_dev *dev_qs3000 __devinitdata = NULL; @@ -1035,7 +1034,7 @@ setup_elsa_pci(struct IsdnCard *card) struct IsdnCardState *cs = card->cs; cs->subtyp = 0; - if ((dev_qs1000 = pci_find_device(PCI_VENDOR_ID_ELSA, + if ((dev_qs1000 = hisax_find_pci_device(PCI_VENDOR_ID_ELSA, PCI_DEVICE_ID_ELSA_MICROLINK, dev_qs1000))) { if (pci_enable_device(dev_qs1000)) return(0); @@ -1043,7 +1042,7 @@ setup_elsa_pci(struct IsdnCard *card) cs->irq = dev_qs1000->irq; cs->hw.elsa.cfg = pci_resource_start(dev_qs1000, 1); cs->hw.elsa.base = pci_resource_start(dev_qs1000, 3); - } else if ((dev_qs3000 = pci_find_device(PCI_VENDOR_ID_ELSA, + } else if ((dev_qs3000 = hisax_find_pci_device(PCI_VENDOR_ID_ELSA, PCI_DEVICE_ID_ELSA_QS3000, dev_qs3000))) { if (pci_enable_device(dev_qs3000)) return(0); @@ -1086,15 +1085,6 @@ setup_elsa_pci(struct IsdnCard *card) return (1); } -#else - -static int __devinit -setup_elsa_pci(struct IsdnCard *card) -{ - return (1); -} -#endif /* CONFIG_PCI_LEGACY */ - static int __devinit setup_elsa_common(struct IsdnCard *card) { diff --git a/drivers/isdn/hisax/enternow_pci.c b/drivers/isdn/hisax/enternow_pci.c index 39f421e..26264ab 100644 --- a/drivers/isdn/hisax/enternow_pci.c +++ b/drivers/isdn/hisax/enternow_pci.c @@ -406,7 +406,7 @@ setup_enternow_pci(struct IsdnCard *card) for ( ;; ) { - if ((dev_netjet = pci_find_device(PCI_VENDOR_ID_TIGERJET, + if ((dev_netjet = hisax_find_pci_device(PCI_VENDOR_ID_TIGERJET, PCI_DEVICE_ID_TIGERJET_300, dev_netjet))) { ret = en_pci_probe(dev_netjet, cs); if (!ret) diff --git a/drivers/isdn/hisax/gazel.c b/drivers/isdn/hisax/gazel.c index 0ea3b46..8a6fd8b 100644 --- a/drivers/isdn/hisax/gazel.c +++ b/drivers/isdn/hisax/gazel.c @@ -531,7 +531,6 @@ setup_gazelisa(struct IsdnCard *card, struct IsdnCardState *cs) return (0); } -#ifdef CONFIG_PCI_LEGACY static struct pci_dev *dev_tel __devinitdata = NULL; static int __devinit @@ -546,7 +545,7 @@ setup_gazelpci(struct IsdnCardState *cs) found = 0; seekcard = PCI_DEVICE_ID_PLX_R685; for (nbseek = 0; nbseek < 4; nbseek++) { - if ((dev_tel = pci_find_device(PCI_VENDOR_ID_PLX, + if ((dev_tel = hisax_find_pci_device(PCI_VENDOR_ID_PLX, seekcard, dev_tel))) { if (pci_enable_device(dev_tel)) return 1; @@ -620,7 +619,6 @@ setup_gazelpci(struct IsdnCardState *cs) return (0); } -#endif /* CONFIG_PCI_LEGACY */ int __devinit setup_gazel(struct IsdnCard *card) @@ -639,14 +637,8 @@ setup_gazel(struct IsdnCard *card) if (setup_gazelisa(card, cs)) return (0); } else { - -#ifdef CONFIG_PCI_LEGACY if (setup_gazelpci(cs)) return (0); -#else - printk(KERN_WARNING "Gazel: Card PCI requested and NO_PCI_BIOS, unable to config\n"); - return (0); -#endif /* CONFIG_PCI */ } if (reserve_regions(card, cs)) { diff --git a/drivers/isdn/hisax/hfc_pci.c b/drivers/isdn/hisax/hfc_pci.c index 1091473..917cc84 100644 --- a/drivers/isdn/hisax/hfc_pci.c +++ b/drivers/isdn/hisax/hfc_pci.c @@ -1658,7 +1658,7 @@ setup_hfcpci(struct IsdnCard *card) i = 0; while (id_list[i].vendor_id) { - tmp_hfcpci = pci_find_device(id_list[i].vendor_id, + tmp_hfcpci = hisax_find_pci_device(id_list[i].vendor_id, id_list[i].device_id, dev_hfcpci); i++; diff --git a/drivers/isdn/hisax/hisax.h b/drivers/isdn/hisax/hisax.h index 0685c19..832a878 100644 --- a/drivers/isdn/hisax/hisax.h +++ b/drivers/isdn/hisax/hisax.h @@ -1323,3 +1323,26 @@ void release_tei(struct IsdnCardState *cs); char *HiSax_getrev(const char *revision); int TeiNew(void); void TeiFree(void); + +#ifdef CONFIG_PCI + +#include <linux/pci.h> + +/* adaptation wrapper for old usage + * WARNING! This is unfit for use in a PCI hotplug environment, + * as the returned PCI device can disappear at any moment in time. + * Callers should be converted to use pci_get_device() instead. + */ +static inline struct pci_dev *hisax_find_pci_device(unsigned int vendor, + unsigned int device, + struct pci_dev *from) +{ + struct pci_dev *pdev; + + pci_dev_get(from); + pdev = pci_get_subsys(vendor, device, PCI_ANY_ID, PCI_ANY_ID, from); + pci_dev_put(pdev); + return pdev; +} + +#endif diff --git a/drivers/isdn/hisax/niccy.c b/drivers/isdn/hisax/niccy.c index ef00633..91c4241 100644 --- a/drivers/isdn/hisax/niccy.c +++ b/drivers/isdn/hisax/niccy.c @@ -297,12 +297,11 @@ int __devinit setup_niccy(struct IsdnCard *card) return 0; } } else { -#ifdef CONFIG_PCI_LEGACY static struct pci_dev *niccy_dev __devinitdata; u_int pci_ioaddr; cs->subtyp = 0; - if ((niccy_dev = pci_find_device(PCI_VENDOR_ID_SATSAGEM, + if ((niccy_dev = hisax_find_pci_device(PCI_VENDOR_ID_SATSAGEM, PCI_DEVICE_ID_SATSAGEM_NICCY, niccy_dev))) { if (pci_enable_device(niccy_dev)) @@ -350,11 +349,6 @@ int __devinit setup_niccy(struct IsdnCard *card) release_region(cs->hw.niccy.isac, 4); return 0; } -#else - printk(KERN_WARNING "Niccy: io0 0 and NO_PCI_BIOS\n"); - printk(KERN_WARNING "Niccy: unable to config NICCY PCI\n"); - return 0; -#endif /* CONFIG_PCI_LEGACY */ } printk(KERN_INFO "HiSax: NICCY %s config irq:%d data:0x%X ale:0x%X\n", (cs->subtyp == 1) ? "PnP" : "PCI", diff --git a/drivers/isdn/hisax/nj_s.c b/drivers/isdn/hisax/nj_s.c index 8d36ccc..2344e7b 100644 --- a/drivers/isdn/hisax/nj_s.c +++ b/drivers/isdn/hisax/nj_s.c @@ -276,7 +276,7 @@ setup_netjet_s(struct IsdnCard *card) for ( ;; ) { - if ((dev_netjet = pci_find_device(PCI_VENDOR_ID_TIGERJET, + if ((dev_netjet = hisax_find_pci_device(PCI_VENDOR_ID_TIGERJET, PCI_DEVICE_ID_TIGERJET_300, dev_netjet))) { ret = njs_pci_probe(dev_netjet, cs); if (!ret) diff --git a/drivers/isdn/hisax/nj_u.c b/drivers/isdn/hisax/nj_u.c index d306c94..095e974 100644 --- a/drivers/isdn/hisax/nj_u.c +++ b/drivers/isdn/hisax/nj_u.c @@ -240,7 +240,7 @@ setup_netjet_u(struct IsdnCard *card) for ( ;; ) { - if ((dev_netjet = pci_find_device(PCI_VENDOR_ID_TIGERJET, + if ((dev_netjet = hisax_find_pci_device(PCI_VENDOR_ID_TIGERJET, PCI_DEVICE_ID_TIGERJET_300, dev_netjet))) { ret = nju_pci_probe(dev_netjet, cs); if (!ret) diff --git a/drivers/isdn/hisax/sedlbauer.c b/drivers/isdn/hisax/sedlbauer.c index 5569a52..b90abd9 100644 --- a/drivers/isdn/hisax/sedlbauer.c +++ b/drivers/isdn/hisax/sedlbauer.c @@ -598,7 +598,6 @@ setup_sedlbauer_isapnp(struct IsdnCard *card, int *bytecnt) } #endif /* __ISAPNP__ */ -#ifdef CONFIG_PCI_LEGACY static struct pci_dev *dev_sedl __devinitdata = NULL; static int __devinit @@ -607,7 +606,7 @@ setup_sedlbauer_pci(struct IsdnCard *card) struct IsdnCardState *cs = card->cs; u16 sub_vendor_id, sub_id; - if ((dev_sedl = pci_find_device(PCI_VENDOR_ID_TIGERJET, + if ((dev_sedl = hisax_find_pci_device(PCI_VENDOR_ID_TIGERJET, PCI_DEVICE_ID_TIGERJET_100, dev_sedl))) { if (pci_enable_device(dev_sedl)) return(0); @@ -665,16 +664,6 @@ setup_sedlbauer_pci(struct IsdnCard *card) return (1); } -#else - -static int __devinit -setup_sedlbauer_pci(struct IsdnCard *card) -{ - return (1); -} - -#endif /* CONFIG_PCI_LEGACY */ - int __devinit setup_sedlbauer(struct IsdnCard *card) { diff --git a/drivers/isdn/hisax/telespci.c b/drivers/isdn/hisax/telespci.c index 28b08de..b85ceb3 100644 --- a/drivers/isdn/hisax/telespci.c +++ b/drivers/isdn/hisax/telespci.c @@ -300,7 +300,7 @@ setup_telespci(struct IsdnCard *card) if (cs->typ != ISDN_CTYPE_TELESPCI) return (0); - if ((dev_tel = pci_find_device (PCI_VENDOR_ID_ZORAN, PCI_DEVICE_ID_ZORAN_36120, dev_tel))) { + if ((dev_tel = hisax_find_pci_device (PCI_VENDOR_ID_ZORAN, PCI_DEVICE_ID_ZORAN_36120, dev_tel))) { if (pci_enable_device(dev_tel)) return(0); cs->irq = dev_tel->irq; diff --git a/drivers/isdn/hisax/w6692.c b/drivers/isdn/hisax/w6692.c index c4d862c..9d6e864 100644 --- a/drivers/isdn/hisax/w6692.c +++ b/drivers/isdn/hisax/w6692.c @@ -1007,7 +1007,7 @@ setup_w6692(struct IsdnCard *card) return (0); while (id_list[id_idx].vendor_id) { - dev_w6692 = pci_find_device(id_list[id_idx].vendor_id, + dev_w6692 = hisax_find_pci_device(id_list[id_idx].vendor_id, id_list[id_idx].device_id, dev_w6692); if (dev_w6692) { diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig index b1ecefa..7858a11 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig @@ -21,17 +21,6 @@ config PCI_MSI If you don't know what to do here, say N. -config PCI_LEGACY - bool "Enable deprecated pci_find_* API" - depends on PCI - default y - help - Say Y here if you want to include support for the deprecated - pci_find_device() API. Most drivers have been converted over - to using the proper hotplug APIs, so this option serves to - include/exclude only a few drivers that are still using this - API. - config PCI_DEBUG bool "PCI Debugging" depends on PCI && DEBUG_KERNEL diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile index 4df48d5..f635608 100644 --- a/drivers/pci/Makefile +++ b/drivers/pci/Makefile @@ -8,9 +8,6 @@ obj-y += access.o bus.o probe.o remove.o pci.o quirks.o \ obj-$(CONFIG_PROC_FS) += proc.o obj-$(CONFIG_SYSFS) += slot.o -obj-$(CONFIG_PCI_LEGACY) += legacy.o -CFLAGS_legacy.o += -Wno-deprecated-declarations - # Build PCI Express stuff if needed obj-$(CONFIG_PCIEPORTBUS) += pcie/ diff --git a/drivers/pci/legacy.c b/drivers/pci/legacy.c deleted file mode 100644 index 871f65c..0000000 --- a/drivers/pci/legacy.c +++ /dev/null @@ -1,34 +0,0 @@ -#include <linux/init.h> -#include <linux/pci.h> -#include <linux/module.h> -#include <linux/interrupt.h> -#include "pci.h" - -/** - * pci_find_device - begin or continue searching for a PCI device by vendor/device id - * @vendor: PCI vendor id to match, or %PCI_ANY_ID to match all vendor ids - * @device: PCI device id to match, or %PCI_ANY_ID to match all device ids - * @from: Previous PCI device found in search, or %NULL for new search. - * - * Iterates through the list of known PCI devices. If a PCI device is found - * with a matching @vendor and @device, a pointer to its device structure is - * returned. Otherwise, %NULL is returned. - * A new search is initiated by passing %NULL as the @from argument. - * Otherwise if @from is not %NULL, searches continue from next device - * on the global list. - * - * NOTE: Do not use this function any more; use pci_get_device() instead, as - * the PCI device returned by this function can disappear at any moment in - * time. - */ -struct pci_dev *pci_find_device(unsigned int vendor, unsigned int device, - struct pci_dev *from) -{ - struct pci_dev *pdev; - - pci_dev_get(from); - pdev = pci_get_subsys(vendor, device, PCI_ANY_ID, PCI_ANY_ID, from); - pci_dev_put(pdev); - return pdev; -} -EXPORT_SYMBOL(pci_find_device); diff --git a/include/linux/pci.h b/include/linux/pci.h index 174e539..dd9682c 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -615,12 +615,6 @@ extern void pci_sort_breadthfirst(void); /* Generic PCI functions exported to card drivers */ -#ifdef CONFIG_PCI_LEGACY -struct pci_dev __deprecated *pci_find_device(unsigned int vendor, - unsigned int device, - struct pci_dev *from); -#endif /* CONFIG_PCI_LEGACY */ - enum pci_lost_interrupt_reason { PCI_LOST_IRQ_NO_INFORMATION = 0, PCI_LOST_IRQ_DISABLE_MSI, @@ -973,13 +967,6 @@ static inline int pci_proc_domain(struct pci_bus *bus) _PCI_NOP_ALL(read, *) _PCI_NOP_ALL(write,) -static inline struct pci_dev *pci_find_device(unsigned int vendor, - unsigned int device, - struct pci_dev *from) -{ - return NULL; -} - static inline struct pci_dev *pci_get_device(unsigned int vendor, unsigned int device, struct pci_dev *from) -- 1.6.5.3.298.g39add ^ permalink raw reply related [flat|nested] 27+ messages in thread
* Re: [PATCH/REPOST] pci: push deprecated pci_find_device() function to last user 2010-01-14 22:18 ` [PATCH/REPOST] " Tilman Schmidt @ 2010-01-15 18:08 ` Jesse Barnes 2010-01-16 11:17 ` Stephen Rothwell 0 siblings, 1 reply; 27+ messages in thread From: Jesse Barnes @ 2010-01-15 18:08 UTC (permalink / raw) To: Tilman Schmidt Cc: David Miller, Greg KH, Stephen Rothwell, LKML, netdev, Karsten Keil, isdn4linux On Thu, 14 Jan 2010 23:18:41 +0100 (CET) Tilman Schmidt <tilman@imap.cc> wrote: > Am 14.01.2010 17:28 schrieb Jesse Barnes: > > I can take it, but I lost the original patch. Tilman, can you > > resend? > > Sure, here you are: > > Subject: [PATCH] pci: push deprecated pci_find_device() function to > last user > > The ISDN4Linux HiSax driver family contains the last remaining users > of the deprecated pci_find_device() function. This patch creates a > private copy of that function in HiSax, and removes the now unused > global function together with its controlling configuration option, > CONFIG_PCI_LEGACY. > > Impact: code reorganization, no functional change > Signed-off-by: Tilman Schmidt <tilman@imap.cc> > --- > Note: This patch is not, nor does it intend to be, checkpatch.pl > clean. The issues checkpatch.pl reports on it were already present > before, and are unrelated to the topic of this patch. Applied to my linux-next branch, thanks Tilman. -- Jesse Barnes, Intel Open Source Technology Center ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH/REPOST] pci: push deprecated pci_find_device() function to last user 2010-01-15 18:08 ` Jesse Barnes @ 2010-01-16 11:17 ` Stephen Rothwell 0 siblings, 0 replies; 27+ messages in thread From: Stephen Rothwell @ 2010-01-16 11:17 UTC (permalink / raw) To: Jesse Barnes Cc: Tilman Schmidt, David Miller, Greg KH, LKML, netdev, Karsten Keil, isdn4linux [-- Attachment #1: Type: text/plain, Size: 416 bytes --] Hi all, On Fri, 15 Jan 2010 10:08:30 -0800 Jesse Barnes <jbarnes@virtuousgeek.org> wrote: > > Applied to my linux-next branch, thanks Tilman. Thanks all, this will reduce the x86_64 allmodconfig build warnings by between 1/3 and 1/2. (Cheering can be heard all over the IBM Canberra office :-)) -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --] ^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH/v2] pci: push deprecated pci_find_device() function to last user 2010-01-14 16:28 ` Jesse Barnes 2010-01-14 22:18 ` [PATCH/REPOST] " Tilman Schmidt @ 2010-01-18 16:24 ` Tilman Schmidt 1 sibling, 0 replies; 27+ messages in thread From: Tilman Schmidt @ 2010-01-18 16:24 UTC (permalink / raw) To: Jesse Barnes Cc: David Miller, Greg KH, Stephen Rothwell, LKML, netdev, Karsten Keil, isdn4linux The ISDN4Linux HiSax driver family contains the last remaining users of the deprecated pci_find_device() function. This patch creates a private copy of that function in HiSax, and removes the now unused global function together with its controlling configuration option, CONFIG_PCI_LEGACY. Impact: code reorganization, no functional change Signed-off-by: Tilman Schmidt <tilman@imap.cc> --- Revised to fix !CONFIG_PCI case for combined ISAPNP/PCI drivers. drivers/isdn/hisax/Kconfig | 18 +++++++++--------- drivers/isdn/hisax/avm_pci.c | 6 +++--- drivers/isdn/hisax/bkm_a4t.c | 2 +- drivers/isdn/hisax/bkm_a8.c | 2 +- drivers/isdn/hisax/diva.c | 14 +++++++------- drivers/isdn/hisax/elsa.c | 8 ++++---- drivers/isdn/hisax/enternow_pci.c | 2 +- drivers/isdn/hisax/gazel.c | 8 ++++---- drivers/isdn/hisax/hfc_pci.c | 2 +- drivers/isdn/hisax/hisax.h | 23 +++++++++++++++++++++++ drivers/isdn/hisax/niccy.c | 6 +++--- drivers/isdn/hisax/nj_s.c | 2 +- drivers/isdn/hisax/nj_u.c | 2 +- drivers/isdn/hisax/sedlbauer.c | 6 +++--- drivers/isdn/hisax/telespci.c | 2 +- drivers/isdn/hisax/w6692.c | 2 +- drivers/pci/Kconfig | 11 ----------- drivers/pci/Makefile | 3 --- drivers/pci/legacy.c | 34 ---------------------------------- include/linux/pci.h | 13 ------------- 20 files changed, 64 insertions(+), 102 deletions(-) delete mode 100644 drivers/pci/legacy.c diff --git a/drivers/isdn/hisax/Kconfig b/drivers/isdn/hisax/Kconfig index 3464ebc..452fde9 100644 --- a/drivers/isdn/hisax/Kconfig +++ b/drivers/isdn/hisax/Kconfig @@ -109,7 +109,7 @@ config HISAX_16_3 config HISAX_TELESPCI bool "Teles PCI" - depends on PCI && PCI_LEGACY && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) + depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) help This enables HiSax support for the Teles PCI. See <file:Documentation/isdn/README.HiSax> on how to configure it. @@ -237,7 +237,7 @@ config HISAX_MIC config HISAX_NETJET bool "NETjet card" - depends on PCI && PCI_LEGACY && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) + depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) help This enables HiSax support for the NetJet from Traverse Technologies. @@ -248,7 +248,7 @@ config HISAX_NETJET config HISAX_NETJET_U bool "NETspider U card" - depends on PCI && PCI_LEGACY && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) + depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) help This enables HiSax support for the Netspider U interface ISDN card from Traverse Technologies. @@ -287,7 +287,7 @@ config HISAX_HSTSAPHIR config HISAX_BKM_A4T bool "Telekom A4T card" - depends on PCI && PCI_LEGACY + depends on PCI help This enables HiSax support for the Telekom A4T card. @@ -297,7 +297,7 @@ config HISAX_BKM_A4T config HISAX_SCT_QUADRO bool "Scitel Quadro card" - depends on PCI && PCI_LEGACY + depends on PCI help This enables HiSax support for the Scitel Quadro card. @@ -316,7 +316,7 @@ config HISAX_GAZEL config HISAX_HFC_PCI bool "HFC PCI-Bus cards" - depends on PCI && PCI_LEGACY && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) + depends on PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) help This enables HiSax support for the HFC-S PCI 2BDS0 based cards. @@ -325,7 +325,7 @@ config HISAX_HFC_PCI config HISAX_W6692 bool "Winbond W6692 based cards" - depends on PCI && PCI_LEGACY + depends on PCI help This enables HiSax support for Winbond W6692 based PCI ISDN cards. @@ -341,7 +341,7 @@ config HISAX_HFC_SX config HISAX_ENTERNOW_PCI bool "Formula-n enter:now PCI card" - depends on HISAX_NETJET && PCI && PCI_LEGACY && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) + depends on HISAX_NETJET && PCI && (BROKEN || !(SPARC || PPC || PARISC || M68K || (MIPS && !CPU_LITTLE_ENDIAN) || FRV)) help This enables HiSax support for the Formula-n enter:now PCI ISDN card. @@ -412,7 +412,7 @@ config HISAX_HFC4S8S config HISAX_FRITZ_PCIPNP tristate "AVM Fritz!Card PCI/PCIv2/PnP support (EXPERIMENTAL)" - depends on PCI && PCI_LEGACY && EXPERIMENTAL + depends on PCI && EXPERIMENTAL help This enables the driver for the AVM Fritz!Card PCI, Fritz!Card PCI v2 and Fritz!Card PnP. diff --git a/drivers/isdn/hisax/avm_pci.c b/drivers/isdn/hisax/avm_pci.c index 7cabc5a..14295a1 100644 --- a/drivers/isdn/hisax/avm_pci.c +++ b/drivers/isdn/hisax/avm_pci.c @@ -822,7 +822,7 @@ static int __devinit avm_pnp_setup(struct IsdnCardState *cs) #endif /* __ISAPNP__ */ -#ifndef CONFIG_PCI_LEGACY +#ifndef CONFIG_PCI static int __devinit avm_pci_setup(struct IsdnCardState *cs) { @@ -835,7 +835,7 @@ static struct pci_dev *dev_avm __devinitdata = NULL; static int __devinit avm_pci_setup(struct IsdnCardState *cs) { - if ((dev_avm = pci_find_device(PCI_VENDOR_ID_AVM, + if ((dev_avm = hisax_find_pci_device(PCI_VENDOR_ID_AVM, PCI_DEVICE_ID_AVM_A1, dev_avm))) { if (pci_enable_device(dev_avm)) @@ -864,7 +864,7 @@ static int __devinit avm_pci_setup(struct IsdnCardState *cs) return (1); } -#endif /* CONFIG_PCI_LEGACY */ +#endif /* CONFIG_PCI */ int __devinit setup_avm_pcipnp(struct IsdnCard *card) diff --git a/drivers/isdn/hisax/bkm_a4t.c b/drivers/isdn/hisax/bkm_a4t.c index 9ca2ee5..9f2009c 100644 --- a/drivers/isdn/hisax/bkm_a4t.c +++ b/drivers/isdn/hisax/bkm_a4t.c @@ -340,7 +340,7 @@ setup_bkm_a4t(struct IsdnCard *card) } else return (0); - while ((dev_a4t = pci_find_device(PCI_VENDOR_ID_ZORAN, + while ((dev_a4t = hisax_find_pci_device(PCI_VENDOR_ID_ZORAN, PCI_DEVICE_ID_ZORAN_36120, dev_a4t))) { ret = a4t_pci_probe(dev_a4t, cs, &found, &pci_memaddr); if (!ret) diff --git a/drivers/isdn/hisax/bkm_a8.c b/drivers/isdn/hisax/bkm_a8.c index e1ff471..e775706 100644 --- a/drivers/isdn/hisax/bkm_a8.c +++ b/drivers/isdn/hisax/bkm_a8.c @@ -301,7 +301,7 @@ setup_sct_quadro(struct IsdnCard *card) (sub_vendor_id != PCI_VENDOR_ID_BERKOM))) return (0); if (cs->subtyp == SCT_1) { - while ((dev_a8 = pci_find_device(PCI_VENDOR_ID_PLX, + while ((dev_a8 = hisax_find_pci_device(PCI_VENDOR_ID_PLX, PCI_DEVICE_ID_PLX_9050, dev_a8))) { sub_vendor_id = dev_a8->subsystem_vendor; diff --git a/drivers/isdn/hisax/diva.c b/drivers/isdn/hisax/diva.c index 0b0c2e5..780da9b 100644 --- a/drivers/isdn/hisax/diva.c +++ b/drivers/isdn/hisax/diva.c @@ -1148,7 +1148,7 @@ static int __devinit setup_diva_isapnp(struct IsdnCard *card) #endif /* ISAPNP */ -#ifdef CONFIG_PCI_LEGACY +#ifdef CONFIG_PCI static struct pci_dev *dev_diva __devinitdata = NULL; static struct pci_dev *dev_diva_u __devinitdata = NULL; static struct pci_dev *dev_diva201 __devinitdata = NULL; @@ -1159,21 +1159,21 @@ static int __devinit setup_diva_pci(struct IsdnCard *card) struct IsdnCardState *cs = card->cs; cs->subtyp = 0; - if ((dev_diva = pci_find_device(PCI_VENDOR_ID_EICON, + if ((dev_diva = hisax_find_pci_device(PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA20, dev_diva))) { if (pci_enable_device(dev_diva)) return(0); cs->subtyp = DIVA_PCI; cs->irq = dev_diva->irq; cs->hw.diva.cfg_reg = pci_resource_start(dev_diva, 2); - } else if ((dev_diva_u = pci_find_device(PCI_VENDOR_ID_EICON, + } else if ((dev_diva_u = hisax_find_pci_device(PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA20_U, dev_diva_u))) { if (pci_enable_device(dev_diva_u)) return(0); cs->subtyp = DIVA_PCI; cs->irq = dev_diva_u->irq; cs->hw.diva.cfg_reg = pci_resource_start(dev_diva_u, 2); - } else if ((dev_diva201 = pci_find_device(PCI_VENDOR_ID_EICON, + } else if ((dev_diva201 = hisax_find_pci_device(PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA201, dev_diva201))) { if (pci_enable_device(dev_diva201)) return(0); @@ -1183,7 +1183,7 @@ static int __devinit setup_diva_pci(struct IsdnCard *card) (ulong) ioremap(pci_resource_start(dev_diva201, 0), 4096); cs->hw.diva.cfg_reg = (ulong) ioremap(pci_resource_start(dev_diva201, 1), 4096); - } else if ((dev_diva202 = pci_find_device(PCI_VENDOR_ID_EICON, + } else if ((dev_diva202 = hisax_find_pci_device(PCI_VENDOR_ID_EICON, PCI_DEVICE_ID_EICON_DIVA202, dev_diva202))) { if (pci_enable_device(dev_diva202)) return(0); @@ -1229,14 +1229,14 @@ static int __devinit setup_diva_pci(struct IsdnCard *card) return (1); /* card found */ } -#else /* if !CONFIG_PCI_LEGACY */ +#else /* if !CONFIG_PCI */ static int __devinit setup_diva_pci(struct IsdnCard *card) { return (-1); /* card not found; continue search */ } -#endif /* CONFIG_PCI_LEGACY */ +#endif /* CONFIG_PCI */ int __devinit setup_diva(struct IsdnCard *card) diff --git a/drivers/isdn/hisax/elsa.c b/drivers/isdn/hisax/elsa.c index aa29d1c..23c41fc 100644 --- a/drivers/isdn/hisax/elsa.c +++ b/drivers/isdn/hisax/elsa.c @@ -1025,7 +1025,7 @@ setup_elsa_pcmcia(struct IsdnCard *card) cs->irq); } -#ifdef CONFIG_PCI_LEGACY +#ifdef CONFIG_PCI static struct pci_dev *dev_qs1000 __devinitdata = NULL; static struct pci_dev *dev_qs3000 __devinitdata = NULL; @@ -1035,7 +1035,7 @@ setup_elsa_pci(struct IsdnCard *card) struct IsdnCardState *cs = card->cs; cs->subtyp = 0; - if ((dev_qs1000 = pci_find_device(PCI_VENDOR_ID_ELSA, + if ((dev_qs1000 = hisax_find_pci_device(PCI_VENDOR_ID_ELSA, PCI_DEVICE_ID_ELSA_MICROLINK, dev_qs1000))) { if (pci_enable_device(dev_qs1000)) return(0); @@ -1043,7 +1043,7 @@ setup_elsa_pci(struct IsdnCard *card) cs->irq = dev_qs1000->irq; cs->hw.elsa.cfg = pci_resource_start(dev_qs1000, 1); cs->hw.elsa.base = pci_resource_start(dev_qs1000, 3); - } else if ((dev_qs3000 = pci_find_device(PCI_VENDOR_ID_ELSA, + } else if ((dev_qs3000 = hisax_find_pci_device(PCI_VENDOR_ID_ELSA, PCI_DEVICE_ID_ELSA_QS3000, dev_qs3000))) { if (pci_enable_device(dev_qs3000)) return(0); @@ -1093,7 +1093,7 @@ setup_elsa_pci(struct IsdnCard *card) { return (1); } -#endif /* CONFIG_PCI_LEGACY */ +#endif /* CONFIG_PCI */ static int __devinit setup_elsa_common(struct IsdnCard *card) diff --git a/drivers/isdn/hisax/enternow_pci.c b/drivers/isdn/hisax/enternow_pci.c index 39f421e..26264ab 100644 --- a/drivers/isdn/hisax/enternow_pci.c +++ b/drivers/isdn/hisax/enternow_pci.c @@ -406,7 +406,7 @@ setup_enternow_pci(struct IsdnCard *card) for ( ;; ) { - if ((dev_netjet = pci_find_device(PCI_VENDOR_ID_TIGERJET, + if ((dev_netjet = hisax_find_pci_device(PCI_VENDOR_ID_TIGERJET, PCI_DEVICE_ID_TIGERJET_300, dev_netjet))) { ret = en_pci_probe(dev_netjet, cs); if (!ret) diff --git a/drivers/isdn/hisax/gazel.c b/drivers/isdn/hisax/gazel.c index 0ea3b46..353982f 100644 --- a/drivers/isdn/hisax/gazel.c +++ b/drivers/isdn/hisax/gazel.c @@ -531,7 +531,7 @@ setup_gazelisa(struct IsdnCard *card, struct IsdnCardState *cs) return (0); } -#ifdef CONFIG_PCI_LEGACY +#ifdef CONFIG_PCI static struct pci_dev *dev_tel __devinitdata = NULL; static int __devinit @@ -546,7 +546,7 @@ setup_gazelpci(struct IsdnCardState *cs) found = 0; seekcard = PCI_DEVICE_ID_PLX_R685; for (nbseek = 0; nbseek < 4; nbseek++) { - if ((dev_tel = pci_find_device(PCI_VENDOR_ID_PLX, + if ((dev_tel = hisax_find_pci_device(PCI_VENDOR_ID_PLX, seekcard, dev_tel))) { if (pci_enable_device(dev_tel)) return 1; @@ -620,7 +620,7 @@ setup_gazelpci(struct IsdnCardState *cs) return (0); } -#endif /* CONFIG_PCI_LEGACY */ +#endif /* CONFIG_PCI */ int __devinit setup_gazel(struct IsdnCard *card) @@ -640,7 +640,7 @@ setup_gazel(struct IsdnCard *card) return (0); } else { -#ifdef CONFIG_PCI_LEGACY +#ifdef CONFIG_PCI if (setup_gazelpci(cs)) return (0); #else diff --git a/drivers/isdn/hisax/hfc_pci.c b/drivers/isdn/hisax/hfc_pci.c index 1091473..917cc84 100644 --- a/drivers/isdn/hisax/hfc_pci.c +++ b/drivers/isdn/hisax/hfc_pci.c @@ -1658,7 +1658,7 @@ setup_hfcpci(struct IsdnCard *card) i = 0; while (id_list[i].vendor_id) { - tmp_hfcpci = pci_find_device(id_list[i].vendor_id, + tmp_hfcpci = hisax_find_pci_device(id_list[i].vendor_id, id_list[i].device_id, dev_hfcpci); i++; diff --git a/drivers/isdn/hisax/hisax.h b/drivers/isdn/hisax/hisax.h index 0685c19..832a878 100644 --- a/drivers/isdn/hisax/hisax.h +++ b/drivers/isdn/hisax/hisax.h @@ -1323,3 +1323,26 @@ void release_tei(struct IsdnCardState *cs); char *HiSax_getrev(const char *revision); int TeiNew(void); void TeiFree(void); + +#ifdef CONFIG_PCI + +#include <linux/pci.h> + +/* adaptation wrapper for old usage + * WARNING! This is unfit for use in a PCI hotplug environment, + * as the returned PCI device can disappear at any moment in time. + * Callers should be converted to use pci_get_device() instead. + */ +static inline struct pci_dev *hisax_find_pci_device(unsigned int vendor, + unsigned int device, + struct pci_dev *from) +{ + struct pci_dev *pdev; + + pci_dev_get(from); + pdev = pci_get_subsys(vendor, device, PCI_ANY_ID, PCI_ANY_ID, from); + pci_dev_put(pdev); + return pdev; +} + +#endif diff --git a/drivers/isdn/hisax/niccy.c b/drivers/isdn/hisax/niccy.c index ef00633..ccaa6e1 100644 --- a/drivers/isdn/hisax/niccy.c +++ b/drivers/isdn/hisax/niccy.c @@ -297,12 +297,12 @@ int __devinit setup_niccy(struct IsdnCard *card) return 0; } } else { -#ifdef CONFIG_PCI_LEGACY +#ifdef CONFIG_PCI static struct pci_dev *niccy_dev __devinitdata; u_int pci_ioaddr; cs->subtyp = 0; - if ((niccy_dev = pci_find_device(PCI_VENDOR_ID_SATSAGEM, + if ((niccy_dev = hisax_find_pci_device(PCI_VENDOR_ID_SATSAGEM, PCI_DEVICE_ID_SATSAGEM_NICCY, niccy_dev))) { if (pci_enable_device(niccy_dev)) @@ -354,7 +354,7 @@ int __devinit setup_niccy(struct IsdnCard *card) printk(KERN_WARNING "Niccy: io0 0 and NO_PCI_BIOS\n"); printk(KERN_WARNING "Niccy: unable to config NICCY PCI\n"); return 0; -#endif /* CONFIG_PCI_LEGACY */ +#endif /* CONFIG_PCI */ } printk(KERN_INFO "HiSax: NICCY %s config irq:%d data:0x%X ale:0x%X\n", (cs->subtyp == 1) ? "PnP" : "PCI", diff --git a/drivers/isdn/hisax/nj_s.c b/drivers/isdn/hisax/nj_s.c index 8d36ccc..2344e7b 100644 --- a/drivers/isdn/hisax/nj_s.c +++ b/drivers/isdn/hisax/nj_s.c @@ -276,7 +276,7 @@ setup_netjet_s(struct IsdnCard *card) for ( ;; ) { - if ((dev_netjet = pci_find_device(PCI_VENDOR_ID_TIGERJET, + if ((dev_netjet = hisax_find_pci_device(PCI_VENDOR_ID_TIGERJET, PCI_DEVICE_ID_TIGERJET_300, dev_netjet))) { ret = njs_pci_probe(dev_netjet, cs); if (!ret) diff --git a/drivers/isdn/hisax/nj_u.c b/drivers/isdn/hisax/nj_u.c index d306c94..095e974 100644 --- a/drivers/isdn/hisax/nj_u.c +++ b/drivers/isdn/hisax/nj_u.c @@ -240,7 +240,7 @@ setup_netjet_u(struct IsdnCard *card) for ( ;; ) { - if ((dev_netjet = pci_find_device(PCI_VENDOR_ID_TIGERJET, + if ((dev_netjet = hisax_find_pci_device(PCI_VENDOR_ID_TIGERJET, PCI_DEVICE_ID_TIGERJET_300, dev_netjet))) { ret = nju_pci_probe(dev_netjet, cs); if (!ret) diff --git a/drivers/isdn/hisax/sedlbauer.c b/drivers/isdn/hisax/sedlbauer.c index 5569a52..69dfc8d 100644 --- a/drivers/isdn/hisax/sedlbauer.c +++ b/drivers/isdn/hisax/sedlbauer.c @@ -598,7 +598,7 @@ setup_sedlbauer_isapnp(struct IsdnCard *card, int *bytecnt) } #endif /* __ISAPNP__ */ -#ifdef CONFIG_PCI_LEGACY +#ifdef CONFIG_PCI static struct pci_dev *dev_sedl __devinitdata = NULL; static int __devinit @@ -607,7 +607,7 @@ setup_sedlbauer_pci(struct IsdnCard *card) struct IsdnCardState *cs = card->cs; u16 sub_vendor_id, sub_id; - if ((dev_sedl = pci_find_device(PCI_VENDOR_ID_TIGERJET, + if ((dev_sedl = hisax_find_pci_device(PCI_VENDOR_ID_TIGERJET, PCI_DEVICE_ID_TIGERJET_100, dev_sedl))) { if (pci_enable_device(dev_sedl)) return(0); @@ -673,7 +673,7 @@ setup_sedlbauer_pci(struct IsdnCard *card) return (1); } -#endif /* CONFIG_PCI_LEGACY */ +#endif /* CONFIG_PCI */ int __devinit setup_sedlbauer(struct IsdnCard *card) diff --git a/drivers/isdn/hisax/telespci.c b/drivers/isdn/hisax/telespci.c index 28b08de..b85ceb3 100644 --- a/drivers/isdn/hisax/telespci.c +++ b/drivers/isdn/hisax/telespci.c @@ -300,7 +300,7 @@ setup_telespci(struct IsdnCard *card) if (cs->typ != ISDN_CTYPE_TELESPCI) return (0); - if ((dev_tel = pci_find_device (PCI_VENDOR_ID_ZORAN, PCI_DEVICE_ID_ZORAN_36120, dev_tel))) { + if ((dev_tel = hisax_find_pci_device (PCI_VENDOR_ID_ZORAN, PCI_DEVICE_ID_ZORAN_36120, dev_tel))) { if (pci_enable_device(dev_tel)) return(0); cs->irq = dev_tel->irq; diff --git a/drivers/isdn/hisax/w6692.c b/drivers/isdn/hisax/w6692.c index c4d862c..9d6e864 100644 --- a/drivers/isdn/hisax/w6692.c +++ b/drivers/isdn/hisax/w6692.c @@ -1007,7 +1007,7 @@ setup_w6692(struct IsdnCard *card) return (0); while (id_list[id_idx].vendor_id) { - dev_w6692 = pci_find_device(id_list[id_idx].vendor_id, + dev_w6692 = hisax_find_pci_device(id_list[id_idx].vendor_id, id_list[id_idx].device_id, dev_w6692); if (dev_w6692) { diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig index b1ecefa..7858a11 100644 --- a/drivers/pci/Kconfig +++ b/drivers/pci/Kconfig @@ -21,17 +21,6 @@ config PCI_MSI If you don't know what to do here, say N. -config PCI_LEGACY - bool "Enable deprecated pci_find_* API" - depends on PCI - default y - help - Say Y here if you want to include support for the deprecated - pci_find_device() API. Most drivers have been converted over - to using the proper hotplug APIs, so this option serves to - include/exclude only a few drivers that are still using this - API. - config PCI_DEBUG bool "PCI Debugging" depends on PCI && DEBUG_KERNEL diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile index 4df48d5..f635608 100644 --- a/drivers/pci/Makefile +++ b/drivers/pci/Makefile @@ -8,9 +8,6 @@ obj-y += access.o bus.o probe.o remove.o pci.o quirks.o \ obj-$(CONFIG_PROC_FS) += proc.o obj-$(CONFIG_SYSFS) += slot.o -obj-$(CONFIG_PCI_LEGACY) += legacy.o -CFLAGS_legacy.o += -Wno-deprecated-declarations - # Build PCI Express stuff if needed obj-$(CONFIG_PCIEPORTBUS) += pcie/ diff --git a/drivers/pci/legacy.c b/drivers/pci/legacy.c deleted file mode 100644 index 871f65c..0000000 --- a/drivers/pci/legacy.c +++ /dev/null @@ -1,34 +0,0 @@ -#include <linux/init.h> -#include <linux/pci.h> -#include <linux/module.h> -#include <linux/interrupt.h> -#include "pci.h" - -/** - * pci_find_device - begin or continue searching for a PCI device by vendor/device id - * @vendor: PCI vendor id to match, or %PCI_ANY_ID to match all vendor ids - * @device: PCI device id to match, or %PCI_ANY_ID to match all device ids - * @from: Previous PCI device found in search, or %NULL for new search. - * - * Iterates through the list of known PCI devices. If a PCI device is found - * with a matching @vendor and @device, a pointer to its device structure is - * returned. Otherwise, %NULL is returned. - * A new search is initiated by passing %NULL as the @from argument. - * Otherwise if @from is not %NULL, searches continue from next device - * on the global list. - * - * NOTE: Do not use this function any more; use pci_get_device() instead, as - * the PCI device returned by this function can disappear at any moment in - * time. - */ -struct pci_dev *pci_find_device(unsigned int vendor, unsigned int device, - struct pci_dev *from) -{ - struct pci_dev *pdev; - - pci_dev_get(from); - pdev = pci_get_subsys(vendor, device, PCI_ANY_ID, PCI_ANY_ID, from); - pci_dev_put(pdev); - return pdev; -} -EXPORT_SYMBOL(pci_find_device); diff --git a/include/linux/pci.h b/include/linux/pci.h index 174e539..dd9682c 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -615,12 +615,6 @@ extern void pci_sort_breadthfirst(void); /* Generic PCI functions exported to card drivers */ -#ifdef CONFIG_PCI_LEGACY -struct pci_dev __deprecated *pci_find_device(unsigned int vendor, - unsigned int device, - struct pci_dev *from); -#endif /* CONFIG_PCI_LEGACY */ - enum pci_lost_interrupt_reason { PCI_LOST_IRQ_NO_INFORMATION = 0, PCI_LOST_IRQ_DISABLE_MSI, @@ -973,13 +967,6 @@ static inline int pci_proc_domain(struct pci_bus *bus) _PCI_NOP_ALL(read, *) _PCI_NOP_ALL(write,) -static inline struct pci_dev *pci_find_device(unsigned int vendor, - unsigned int device, - struct pci_dev *from) -{ - return NULL; -} - static inline struct pci_dev *pci_get_device(unsigned int vendor, unsigned int device, struct pci_dev *from) -- 1.6.5.3.298.g39add ^ permalink raw reply related [flat|nested] 27+ messages in thread
* Re: Can we remove pci_find_device() yet? 2010-01-11 20:01 ` Greg KH ` (3 preceding siblings ...) 2010-01-13 14:23 ` [PATCH] pci: push deprecated pci_find_device() function to last user Tilman Schmidt @ 2010-01-14 10:18 ` Andi Kleen 2010-01-14 11:02 ` Alan Cox 4 siblings, 1 reply; 27+ messages in thread From: Andi Kleen @ 2010-01-14 10:18 UTC (permalink / raw) To: Greg KH Cc: Tilman Schmidt, Stephen Rothwell, LKML, netdev, Karsten Keil, isdn4linux Greg KH <gregkh@suse.de> writes: > > Close, but if you do this, please name the function > hisax_find_pci_device() or something, and change the drivers to use it > instead. Also put a big fat warning in the function that calling this > is unsafe for any PCI hotplug type machine. It would be better to enforce this constraint at runtime. e.g. set some global variable that forbids device removal and warn in the kernel log. In theory this could be also done per device, but I guess that would be more effort. Of course it cannot prevent the user from really removing a device, but at least the pci_dev could stay around. -Andi -- ak@linux.intel.com -- Speaking for myself only. ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: Can we remove pci_find_device() yet? 2010-01-14 10:18 ` Can we remove pci_find_device() yet? Andi Kleen @ 2010-01-14 11:02 ` Alan Cox 2010-01-14 11:03 ` Andi Kleen 2010-01-20 15:11 ` Tilman Schmidt 0 siblings, 2 replies; 27+ messages in thread From: Alan Cox @ 2010-01-14 11:02 UTC (permalink / raw) To: Andi Kleen Cc: Greg KH, Tilman Schmidt, Stephen Rothwell, LKML, netdev, Karsten Keil, isdn4linux > e.g. set some global variable that forbids device removal > and warn in the kernel log. In theory this could be also > done per device, but I guess that would be more effort. There is a simpler way to do that, which is to just leak a reference in the hisax_find_pci_device hack. The pci_dev won't be going anywhere then. ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: Can we remove pci_find_device() yet? 2010-01-14 11:02 ` Alan Cox @ 2010-01-14 11:03 ` Andi Kleen 2010-01-14 12:39 ` Tilman Schmidt 2010-01-20 15:11 ` Tilman Schmidt 1 sibling, 1 reply; 27+ messages in thread From: Andi Kleen @ 2010-01-14 11:03 UTC (permalink / raw) To: Alan Cox Cc: Andi Kleen, Greg KH, Tilman Schmidt, Stephen Rothwell, LKML, netdev, Karsten Keil, isdn4linux On Thu, Jan 14, 2010 at 11:02:14AM +0000, Alan Cox wrote: > > e.g. set some global variable that forbids device removal > > and warn in the kernel log. In theory this could be also > > done per device, but I guess that would be more effort. > > There is a simpler way to do that, which is to just leak a reference in > the hisax_find_pci_device hack. The pci_dev won't be going anywhere then. You just have to do it once, otherwise it'll fail after 4 billion times. -Andi -- ak@linux.intel.com -- Speaking for myself only. ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: Can we remove pci_find_device() yet? 2010-01-14 11:03 ` Andi Kleen @ 2010-01-14 12:39 ` Tilman Schmidt 0 siblings, 0 replies; 27+ messages in thread From: Tilman Schmidt @ 2010-01-14 12:39 UTC (permalink / raw) To: Andi Kleen Cc: Alan Cox, Greg KH, Stephen Rothwell, LKML, netdev, Karsten Keil, isdn4linux -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2010-01-14 12:03 schrieb Andi Kleen: > On Thu, Jan 14, 2010 at 11:02:14AM +0000, Alan Cox wrote: [It would be better to enforce this constraint at runtime.] >> There is a simpler way to do that, which is to just leak a reference in >> the hisax_find_pci_device hack. The pci_dev won't be going anywhere then. > > You just have to do it once, otherwise it'll fail after 4 billion times. I guess we could live with that. pci_find_device() or its successor, the hisax_find_pci_device() hack, is only called during device setup, once for most drivers and at the very most 24 times for hfc_pci. Someone would have to rmmod/insmod a HiSax module more than a hundred million times to accumulate four billion calls. - -- Tilman Schmidt E-Mail: tilman@imap.cc Bonn, Germany Diese Nachricht besteht zu 100% aus wiederverwerteten Bits. Ungeöffnet mindestens haltbar bis: (siehe Rückseite) -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.12 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAktPEHMACgkQQ3+did9BuFuQ/gCgkhu6RJIwrpIDAJMWbO1mZgOd BKwAnAh6kX5F/+dFPIrK/XLovEAv/R7O =fflE -----END PGP SIGNATURE----- ^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: Can we remove pci_find_device() yet? 2010-01-14 11:02 ` Alan Cox 2010-01-14 11:03 ` Andi Kleen @ 2010-01-20 15:11 ` Tilman Schmidt 1 sibling, 0 replies; 27+ messages in thread From: Tilman Schmidt @ 2010-01-20 15:11 UTC (permalink / raw) To: Alan Cox Cc: Andi Kleen, Greg KH, Stephen Rothwell, LKML, netdev, Karsten Keil, isdn4linux On Thu, Jan 14, 2010 at 11:02:14AM +0000, Alan Cox wrote: > > e.g. set some global variable that forbids device removal > > and warn in the kernel log. In theory this could be also > > done per device, but I guess that would be more effort. > > There is a simpler way to do that, which is to just leak a reference in > the hisax_find_pci_device hack. The pci_dev won't be going anywhere then. Something like this? (On top of my previous patch introducing hisax_find_pci_device in the first place.) Subject: [PATCH RFC] isdn/hisax: intentionally leak a reference in hisax_find_pci_device Take a reference to the returned pci_dev which will never be released. Until the HiSax drivers are fixed for proper PCI hotplug support, this appears as the lesser evil compared to the danger of the structure being freed without the caller knowing it. Impact: replacing a bug by another, less consequential one Signed-off-by: Tilman Schmidt <tilman@imap.cc> --- drivers/isdn/hisax/hisax.h | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/isdn/hisax/hisax.h b/drivers/isdn/hisax/hisax.h index 832a878..e459502 100644 --- a/drivers/isdn/hisax/hisax.h +++ b/drivers/isdn/hisax/hisax.h @@ -1328,21 +1328,18 @@ void TeiFree(void); #include <linux/pci.h> -/* adaptation wrapper for old usage - * WARNING! This is unfit for use in a PCI hotplug environment, - * as the returned PCI device can disappear at any moment in time. +/* This function replaces the former function pci_find_device(). + * Unlike the latter, it takes a reference on the returned pci_dev, + * resulting in a reference leak. This is intentional and serves to + * prevent an untimely release of the PCI device structure. * Callers should be converted to use pci_get_device() instead. */ static inline struct pci_dev *hisax_find_pci_device(unsigned int vendor, unsigned int device, struct pci_dev *from) { - struct pci_dev *pdev; - pci_dev_get(from); - pdev = pci_get_subsys(vendor, device, PCI_ANY_ID, PCI_ANY_ID, from); - pci_dev_put(pdev); - return pdev; + return pci_get_subsys(vendor, device, PCI_ANY_ID, PCI_ANY_ID, from); } #endif -- 1.6.5.3.298.g39add ^ permalink raw reply related [flat|nested] 27+ messages in thread
end of thread, other threads:[~2010-01-20 15:19 UTC | newest] Thread overview: 27+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2010-01-08 0:22 Can we remove pci_find_device() yet? Stephen Rothwell 2010-01-08 4:46 ` Greg KH 2010-01-11 19:46 ` Tilman Schmidt 2010-01-11 20:01 ` Greg KH 2010-01-12 0:21 ` Stephen Rothwell 2010-01-12 0:46 ` Greg KH 2010-01-12 16:42 ` Tilman Schmidt 2010-01-12 17:39 ` Greg KH 2010-01-13 9:02 ` Tilman Schmidt 2010-01-12 20:34 ` Krzysztof Halasa 2010-01-12 20:53 ` Ben Hutchings 2010-01-12 21:18 ` Greg KH 2010-01-13 15:09 ` Krzysztof Halasa 2010-01-13 14:23 ` [PATCH] pci: push deprecated pci_find_device() function to last user Tilman Schmidt 2010-01-14 4:33 ` David Miller 2010-01-14 4:43 ` Greg KH 2010-01-14 8:12 ` David Miller 2010-01-14 16:28 ` Jesse Barnes 2010-01-14 22:18 ` [PATCH/REPOST] " Tilman Schmidt 2010-01-15 18:08 ` Jesse Barnes 2010-01-16 11:17 ` Stephen Rothwell 2010-01-18 16:24 ` [PATCH/v2] " Tilman Schmidt 2010-01-14 10:18 ` Can we remove pci_find_device() yet? Andi Kleen 2010-01-14 11:02 ` Alan Cox 2010-01-14 11:03 ` Andi Kleen 2010-01-14 12:39 ` Tilman Schmidt 2010-01-20 15:11 ` Tilman Schmidt
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).