Hi all,

Today's linux-next merge of the net-next tree got a conflict in:

  drivers/net/phy/phy.c

between commit:

  a2c054a896b8 ("net: phy: Tell caller result of phy_change()")

from the net tree and commit:

  4fff2d33c707 ("net: phy: remove phy_error from phy_disable_interrupts")

from the net-next tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/net/phy/phy.c
index 9aabfa1a455a,c2d9027be863..000000000000
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@@ -617,77 -617,6 +617,68 @@@ static void phy_error(struct phy_devic
        phy_trigger_machine(phydev, false);
  }
  
 +/**
 + * phy_disable_interrupts - Disable the PHY interrupts from the PHY side
 + * @phydev: target phy_device struct
 + */
 +static int phy_disable_interrupts(struct phy_device *phydev)
 +{
 +      int err;
 +
 +      /* Disable PHY interrupts */
 +      err = phy_config_interrupt(phydev, PHY_INTERRUPT_DISABLED);
 +      if (err)
-               goto phy_err;
++              return err;
 +
 +      /* Clear the interrupt */
-       err = phy_clear_interrupt(phydev);
-       if (err)
-               goto phy_err;
- 
-       return 0;
- 
- phy_err:
-       phy_error(phydev);
- 
-       return err;
++      return phy_clear_interrupt(phydev);
 +}
 +
 +/**
 + * phy_change - Called by the phy_interrupt to handle PHY changes
 + * @phydev: phy_device struct that interrupted
 + */
 +static irqreturn_t phy_change(struct phy_device *phydev)
 +{
 +      if (phy_interrupt_is_valid(phydev)) {
 +              if (phydev->drv->did_interrupt &&
 +                  !phydev->drv->did_interrupt(phydev))
 +                      return IRQ_NONE;
 +
 +              if (phydev->state == PHY_HALTED)
 +                      if (phy_disable_interrupts(phydev))
 +                              goto phy_err;
 +      }
 +
 +      mutex_lock(&phydev->lock);
 +      if ((PHY_RUNNING == phydev->state) || (PHY_NOLINK == phydev->state))
 +              phydev->state = PHY_CHANGELINK;
 +      mutex_unlock(&phydev->lock);
 +
 +      /* reschedule state queue work to run as soon as possible */
 +      phy_trigger_machine(phydev, true);
 +
 +      if (phy_interrupt_is_valid(phydev) && phy_clear_interrupt(phydev))
 +              goto phy_err;
 +      return IRQ_HANDLED;
 +
 +phy_err:
 +      phy_error(phydev);
 +      return IRQ_NONE;
 +}
 +
 +/**
 + * phy_change_work - Scheduled by the phy_mac_interrupt to handle PHY changes
 + * @work: work_struct that describes the work to be done
 + */
 +void phy_change_work(struct work_struct *work)
 +{
 +      struct phy_device *phydev =
 +              container_of(work, struct phy_device, phy_queue);
 +
 +      phy_change(phydev);
 +}
 +
  /**
   * phy_interrupt - PHY interrupt handler
   * @irq: interrupt line

Attachment: pgpLLwDS2LUn4.pgp
Description: OpenPGP digital signature

Reply via email to