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

Commit 5397db90 authored by Daeseok Youn's avatar Daeseok Youn Committed by Greg Kroah-Hartman
Browse files

staging: silicom: remove redundant pci_get_drvdata() call 



The pci_get_drvdata() and checking NULL for dev are
called twice in while loop in is_bypass_dev().

Signed-off-by: default avatarDaeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2f4285d1

drivers/staging/silicom/bypasslib/bypass.c

+23 −28
Original line number Diff line number Diff line
@@ -148,8 +148,6 @@ static int is_bypass_dev(int if_index) 
	int data = 0;



	while ((pdev = pci_get_class(PCI_CLASS_NETWORK_ETHERNET << 8, pdev))) {

		dev = pci_get_drvdata(pdev);

		if (dev != NULL) {

		dev = pci_get_drvdata(pdev);

		if ((dev != NULL) && (dev->ifindex == if_index)) {

			if ((pdev->vendor == SILICOM_VID) &&
@@ -169,9 +167,7 @@ static int is_bypass_dev(int if_index) 
					info.cmd = ETHTOOL_GDRVINFO;

					ops->get_drvinfo(dev, &info);

					for (; bp_desc_array[k]; k++)

							if (!

							    (strcmp

							     (bp_desc_array[k],

						if (!(strcmp(bp_desc_array[k],

							     info.driver)))

							goto send_cmd;
@@ -182,7 +178,6 @@ static int is_bypass_dev(int if_index) 
			return -1;

		}

	}

	}

 send_cmd:

	ret = do_cmd(dev, &ifr, IS_BYPASS, &data);

	return ret < 0 ? -1 : ret;