All of lore.kernel.org
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@infradead.org>
To: Amit Gud <amitg@calsoftinc.com>
Cc: netdev@oss.sgi.com, jgarzik@pobox.com, gud@eth.net,
	kernel-janitors@lists.osdl.org
Subject: [KJ] Re: [PATCH 9/18] drivers/net/ remove pci_find_{device, subsys}
Date: Mon, 14 Feb 2005 21:07:20 +0000	[thread overview]
Message-ID: <20050214210720.GA10196@infradead.org> (raw)
In-Reply-To: <200502141125.25185.amitg@calsoftinc.com>

[-- Attachment #1: Type: text/plain, Size: 5604 bytes --]

> 
> diff -uprN orig/drivers/net/e1000/e1000_main.c linux-2.6.11-rc3/drivers/net/e1000/e1000_main.c
> --- orig/drivers/net/e1000/e1000_main.c	2005-02-11 15:19:48.000000000 +0530
> +++ linux-2.6.11-rc3/drivers/net/e1000/e1000_main.c	2005-02-14 02:02:48.000000000 +0530
> @@ -2792,7 +2792,7 @@ e1000_notify_reboot(struct notifier_bloc
>  	case SYS_DOWN:
>  	case SYS_HALT:
>  	case SYS_POWER_OFF:
> -		while((pdev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, pdev))) {
> +		while((pdev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pdev))) {
>  			if(pci_dev_driver(pdev) == &e1000_driver)
>  				e1000_suspend(pdev, 3);

Wrong.  The driver should implement ->shutdown instead.

> diff -uprN orig/drivers/net/fc/iph5526.c linux-2.6.11-rc3/drivers/net/fc/iph5526.c
> --- orig/drivers/net/fc/iph5526.c	2004-10-19 03:23:43.000000000 +0530
> +++ linux-2.6.11-rc3/drivers/net/fc/iph5526.c	2005-02-14 02:02:55.000000000 +0530
> @@ -3711,7 +3711,7 @@ int iph5526_detect(Scsi_Host_Template *t
>  		fc[i] = NULL;
>  
>  	for (i = 0; clone_list[i].vendor_id != 0; i++)
> -	while ((pdev = pci_find_device(clone_list[i].vendor_id, clone_list[i].device_id, pdev))) {
> +	while ((pdev = pci_get_device(clone_list[i].vendor_id, clone_list[i].device_id, pdev))) {
>  		unsigned short pci_command;
>  		if (pci_enable_device(pdev))
>  			continue;

this driver will go away soon.

> diff -uprN orig/drivers/net/gt96100eth.c linux-2.6.11-rc3/drivers/net/gt96100eth.c
> --- orig/drivers/net/gt96100eth.c	2005-02-11 15:19:48.000000000 +0530
> +++ linux-2.6.11-rc3/drivers/net/gt96100eth.c	2005-02-14 02:07:09.000000000 +0530
> @@ -615,9 +615,9 @@ static int gt96100_init_module(void)
>  	/*
>  	 * Stupid probe because this really isn't a PCI device
>  	 */
> -	if (!(pci = pci_find_device(PCI_VENDOR_ID_MARVELL,
> +	if (!(pci = pci_get_device(PCI_VENDOR_ID_MARVELL,
>  	                            PCI_DEVICE_ID_MARVELL_GT96100, NULL)) &&
> -	    !(pci = pci_find_device(PCI_VENDOR_ID_MARVELL,
> +	    !(pci = pci_get_device(PCI_VENDOR_ID_MARVELL,
>  		                    PCI_DEVICE_ID_MARVELL_GT96100A, NULL))) {
>  		printk(KERN_ERR __FILE__ ": GT96100 not found!\n");
>  		return -ENODEV;

should use pci_dev_present

> diff -uprN orig/drivers/net/ixgb/ixgb_main.c linux-2.6.11-rc3/drivers/net/ixgb/ixgb_main.c
> --- orig/drivers/net/ixgb/ixgb_main.c	2005-02-11 15:19:48.000000000 +0530
> +++ linux-2.6.11-rc3/drivers/net/ixgb/ixgb_main.c	2005-02-14 02:07:17.000000000 +0530
> @@ -2087,7 +2087,7 @@ ixgb_notify_reboot(struct notifier_block
>  	case SYS_DOWN:
>  	case SYS_HALT:
>  	case SYS_POWER_OFF:
> -		while ((pdev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, pdev))) {
> +		while ((pdev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, pdev))) {
>  			if (pci_dev_driver(pdev) == &ixgb_driver)
>  				ixgb_suspend(pdev, 3);
>  		}

should implement ->shutdown

> diff -uprN orig/drivers/net/sunhme.c linux-2.6.11-rc3/drivers/net/sunhme.c
> --- orig/drivers/net/sunhme.c	2005-02-11 15:19:50.000000000 +0530
> +++ linux-2.6.11-rc3/drivers/net/sunhme.c	2005-02-14 02:07:29.000000000 +0530
> @@ -3312,7 +3312,7 @@ static int __init happy_meal_pci_probe(v
>  	struct pci_dev *pdev = NULL;
>  	int cards = 0;
>  
> -	while ((pdev = pci_find_device(PCI_VENDOR_ID_SUN,
> +	while ((pdev = pci_get_device(PCI_VENDOR_ID_SUN,
>  				       PCI_DEVICE_ID_SUN_HAPPYMEAL, pdev)) != NULL) {
>  		if (pci_enable_device(pdev))
>  			continue;

should switch to proper hotplug-style probing.

> diff -uprN orig/drivers/net/tg3.c linux-2.6.11-rc3/drivers/net/tg3.c
> --- orig/drivers/net/tg3.c	2005-02-11 15:19:50.000000000 +0530
> +++ linux-2.6.11-rc3/drivers/net/tg3.c	2005-02-14 02:07:54.000000000 +0530
> @@ -7825,15 +7825,15 @@ static int __devinit tg3_get_invariants(
>  	 * every mailbox register write to force the writes to be
>  	 * posted to the chip in order.
>  	 */
> -	if (pci_find_device(PCI_VENDOR_ID_INTEL,
> +	if (pci_get_device(PCI_VENDOR_ID_INTEL,
>  			    PCI_DEVICE_ID_INTEL_82801AA_8, NULL) ||
> -	    pci_find_device(PCI_VENDOR_ID_INTEL,
> +	    pci_get_device(PCI_VENDOR_ID_INTEL,
>  			    PCI_DEVICE_ID_INTEL_82801AB_8, NULL) ||
> -	    pci_find_device(PCI_VENDOR_ID_INTEL,
> +	    pci_get_device(PCI_VENDOR_ID_INTEL,
>  			    PCI_DEVICE_ID_INTEL_82801BA_11, NULL) ||
> -	    pci_find_device(PCI_VENDOR_ID_INTEL,
> +	    pci_get_device(PCI_VENDOR_ID_INTEL,
>  			    PCI_DEVICE_ID_INTEL_82801BA_6, NULL) ||
> -	    pci_find_device(PCI_VENDOR_ID_AMD,
> +	    pci_get_device(PCI_VENDOR_ID_AMD,
>  			    PCI_DEVICE_ID_AMD_FE_GATE_700C, NULL))
>  		tp->tg3_flags |= TG3_FLAG_MBOX_WRITE_REORDER;

should use pci_dev_present.

> diff -uprN orig/drivers/net/wan/sdladrv.c linux-2.6.11-rc3/drivers/net/wan/sdladrv.c
> --- orig/drivers/net/wan/sdladrv.c	2004-10-19 03:23:43.000000000 +0530
> +++ linux-2.6.11-rc3/drivers/net/wan/sdladrv.c	2005-02-14 02:08:15.000000000 +0530
> @@ -2032,7 +2032,7 @@ static int find_s514_adapter(sdlahw_t* h
>   
>         slot_no = hw->S514_slot_no;
>    
> -	while ((pci_dev = pci_find_device(V3_VENDOR_ID, V3_DEVICE_ID, pci_dev))
> +	while ((pci_dev = pci_get_device(V3_VENDOR_ID, V3_DEVICE_ID, pci_dev))
>          	!= NULL) {
>                  
>  		pci_read_config_word(pci_dev, PCI_SUBSYS_VENDOR_WORD,
> @@ -2245,7 +2245,7 @@ static int pci_probe(sdlahw_t *hw)
>   
>         slot_no = 0;
>    
> -	while ((pci_dev = pci_find_device(V3_VENDOR_ID, V3_DEVICE_ID, pci_dev))
> +	while ((pci_dev = pci_get_device(V3_VENDOR_ID, V3_DEVICE_ID, pci_dev))
>          	!= NULL) {
>  		
>                  pci_read_config_word(pci_dev, PCI_SUBSYS_VENDOR_WORD,
> 

should use proper hotplug-style probing

[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

      parent reply	other threads:[~2005-02-14 21:07 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-02-14  5:55 [PATCH 9/18] drivers/net/ remove pci_find_{device, subsys} Amit Gud
2005-02-14  6:07 ` [KJ] " Amit Gud
2005-02-14 18:46 ` Greg KH
2005-02-14 18:46   ` Greg KH
2005-02-14 21:07 ` Christoph Hellwig [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20050214210720.GA10196@infradead.org \
    --to=hch@infradead.org \
    --cc=amitg@calsoftinc.com \
    --cc=gud@eth.net \
    --cc=jgarzik@pobox.com \
    --cc=kernel-janitors@lists.osdl.org \
    --cc=netdev@oss.sgi.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.