net: 3com: 3c59x: Change the conditional processing for vortex_ioctl
Subsystems (3)
PATCH 1/1 net: 3com: 3c59x: Change the conditional processing for vortex_ioctl
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.
--- drivers/net/ethernet/3com/3c59x.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/net/ethernet/3com/3c59x.c +9 -6
@@ -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; }
Signature · 1 line
2.20.1
Quoted 6 lines · Meng Tang
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.
Congratulations, you've just added 3 lines of code and broke a driver. Your "simplified" version does not work with EISA devices.
Why? Please stop "improving" drivers if you can't test them.
Quoted 35 lines
Signed-off-by Meng Tang <[email protected]>--- drivers/net/ethernet/3com/3c59x.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)drivers/net/ethernet/3com/3c59x.c +9
-6@@ -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; }
Signature · 1 line
Ondrej Zary