lkml.org 
[lkml]   [2022]   [Mar]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] net: 3com: 3c59x: Change the conditional processing for vortex_ioctl
Date
In the vortex_ioctl, there are two places where there can be better
and easier to understand:
First, it should be better to reverse the check on 'VORTEX_PCI(vp)'
and returned early in order to be easier to understand.
Second, no need to make two 'if(state != 0)' judgments, we can
simplify the execution process.

Signed-off-by: Meng Tang <tangmeng@uniontech.com>
---
drivers/net/ethernet/3com/3c59x.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/drivers/net/ethernet/3com/3c59x.c b/drivers/net/ethernet/3com/3c59x.c
index ccf07667aa5e..c22de3c8cd12 100644
--- a/drivers/net/ethernet/3com/3c59x.c
+++ b/drivers/net/ethernet/3com/3c59x.c
@@ -3032,16 +3032,19 @@ static int vortex_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
struct vortex_private *vp = netdev_priv(dev);
pci_power_t state = 0;

- if(VORTEX_PCI(vp))
- state = VORTEX_PCI(vp)->current_state;
+ if (!VORTEX_PCI(vp))
+ return -EOPNOTSUPP;

- /* The kernel core really should have pci_get_power_state() */
+ state = VORTEX_PCI(vp)->current_state;

- if(state != 0)
+ /* The kernel core really should have pci_get_power_state() */
+ if (!state) {
+ err = generic_mii_ioctl(&vp->mii, if_mii(rq), cmd, NULL);
+ } else {
pci_set_power_state(VORTEX_PCI(vp), PCI_D0);
- err = generic_mii_ioctl(&vp->mii, if_mii(rq), cmd, NULL);
- if(state != 0)
+ err = generic_mii_ioctl(&vp->mii, if_mii(rq), cmd, NULL);
pci_set_power_state(VORTEX_PCI(vp), state);
+ }

return err;
}
--
2.20.1


\
 
 \ /
  Last update: 2022-03-17 05:58    [W:0.036 / U:0.080 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site