3c59x: Remove incorrect locking; correct documented lock hierarchy

vortex_ioctl() was grabbing vortex_private::lock around its call to
generic_mii_ioctl(). This is no longer necessary since there are more
specific locks which the mdio_{read,write}() functions will obtain.
Worse, those functions do not save and restore IRQ flags when locking
the MII state, so interrupts will be enabled when generic_mii_ioctl()
returns.

Since there is currently no need for any function to call
mdio_{read,write}() while holding another spinlock, do not change them
to save and restore IRQ flags but remove the specification of ordering
between vortex_private::lock and vortex_private::mii_lock.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by Ben Hutchings and committed by David S. Miller 24cd804d de6be6c1

+1 -4
+1 -4
drivers/net/3c59x.c
··· 647 u16 io_size; /* Size of PCI region (for release_region) */ 648 649 /* Serialises access to hardware other than MII and variables below. 650 - * The lock hierarchy is rtnl_lock > lock > mii_lock > window_lock. */ 651 spinlock_t lock; 652 653 spinlock_t mii_lock; /* Serialises access to MII */ ··· 2984 { 2985 int err; 2986 struct vortex_private *vp = netdev_priv(dev); 2987 - unsigned long flags; 2988 pci_power_t state = 0; 2989 2990 if(VORTEX_PCI(vp)) ··· 2993 2994 if(state != 0) 2995 pci_set_power_state(VORTEX_PCI(vp), PCI_D0); 2996 - spin_lock_irqsave(&vp->lock, flags); 2997 err = generic_mii_ioctl(&vp->mii, if_mii(rq), cmd, NULL); 2998 - spin_unlock_irqrestore(&vp->lock, flags); 2999 if(state != 0) 3000 pci_set_power_state(VORTEX_PCI(vp), state); 3001
··· 647 u16 io_size; /* Size of PCI region (for release_region) */ 648 649 /* Serialises access to hardware other than MII and variables below. 650 + * The lock hierarchy is rtnl_lock > {lock, mii_lock} > window_lock. */ 651 spinlock_t lock; 652 653 spinlock_t mii_lock; /* Serialises access to MII */ ··· 2984 { 2985 int err; 2986 struct vortex_private *vp = netdev_priv(dev); 2987 pci_power_t state = 0; 2988 2989 if(VORTEX_PCI(vp)) ··· 2994 2995 if(state != 0) 2996 pci_set_power_state(VORTEX_PCI(vp), PCI_D0); 2997 err = generic_mii_ioctl(&vp->mii, if_mii(rq), cmd, NULL); 2998 if(state != 0) 2999 pci_set_power_state(VORTEX_PCI(vp), state); 3000