Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 781223a1 authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by David S. Miller
Browse files

sbni: use pci_dev->subsystem_device 



The driver reads PCI subsystem ID from the PCI configuration register while it's
already stored by the PCI subsystem in the 'subsystem_device' field of 'struct
pci_dev'...

Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ccbae55e

drivers/net/wan/sbni.c

+1 −4
Original line number Diff line number Diff line
@@ -303,7 +303,6 @@ sbni_pci_probe( struct net_device *dev ) 
	       != NULL ) {

		int  pci_irq_line;

		unsigned long  pci_ioaddr;

		u16  subsys;



		if( pdev->vendor != SBNI_PCI_VENDOR &&

		    pdev->device != SBNI_PCI_DEVICE )
@@ -314,9 +313,7 @@ sbni_pci_probe( struct net_device *dev ) 


		/* Avoid already found cards from previous calls */

		if( !request_region( pci_ioaddr, SBNI_IO_EXTENT, dev->name ) ) {

			pci_read_config_word( pdev, PCI_SUBSYSTEM_ID, &subsys );



			if (subsys != 2)

			if (pdev->subsystem_device != 2)

				continue;



			/* Dual adapter is present */