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

Commit fccbfd18 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "net: stmmac: Fix build errors"

parents 03d33846 47dc78a0

drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c

+2 −0
Original line number Diff line number Diff line
@@ -611,6 +611,8 @@ static irqreturn_t ETHQOS_PHY_ISR(int irq, void *dev_data) 
	struct qcom_ethqos *ethqos = (struct qcom_ethqos *)dev_data;



	queue_work(system_wq, &ethqos->emac_phy_work);



	return IRQ_HANDLED;

}



static int ethqos_phy_intr_enable(struct qcom_ethqos *ethqos)

drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-gpio.c

+1 −1
Original line number Diff line number Diff line
@@ -193,9 +193,9 @@ int ethqos_init_gpio(struct qcom_ethqos *ethqos) 
{

	struct pinctrl *pinctrl;

	struct pinctrl_state *emac_pps_0;

	int ret = 0;



	ethqos->gpio_phy_intr_redirect = -1;

	int ret = 0;



	pinctrl = devm_pinctrl_get(&ethqos->pdev->dev);

	if (IS_ERR_OR_NULL(pinctrl)) {

drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-pps.c

+2 −1
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ int ppsout_config(struct stmmac_priv *priv, struct ifr_data_struct *req) 
	int interval, width;

	u32 sub_second_inc, value;

	void __iomem *ioaddr = priv->ioaddr;

	u32 val;



	if (!eth_pps_cfg->ppsout_start) {

		ppsout_stop(priv, eth_pps_cfg);
@@ -203,7 +204,7 @@ int ppsout_config(struct stmmac_priv *priv, struct ifr_data_struct *req) 
	priv->hw->ptp->init_systime(priv->ptpaddr, 0, 0);

	priv->hw->ptp->adjust_systime(priv->ptpaddr, 0, 0, 0, 1);



	u32 val = readl_relaxed(ioaddr + MAC_PPS_CONTROL);

	val = readl_relaxed(ioaddr + MAC_PPS_CONTROL);



	sub_second_inc = pps_config_sub_second_increment

			 (priv->ptpaddr, eth_pps_cfg->ptpclk_freq,

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+0 −4
Original line number Diff line number Diff line
@@ -365,7 +365,6 @@ bool stmmac_eee_init(struct stmmac_priv *priv) 
{

	struct net_device *ndev = priv->dev;

	int interface = priv->plat->interface;

	unsigned long flags;

	bool ret = false;



	if ((interface != PHY_INTERFACE_MODE_MII) &&
@@ -790,7 +789,6 @@ static void stmmac_adjust_link(struct net_device *dev) 
{

	struct stmmac_priv *priv = netdev_priv(dev);

	struct phy_device *phydev = dev->phydev;

	unsigned long flags;

	bool new_state = false;



	if (!phydev)
@@ -4382,7 +4380,6 @@ int stmmac_suspend(struct device *dev) 
{

	struct net_device *ndev = dev_get_drvdata(dev);

	struct stmmac_priv *priv = netdev_priv(ndev);

	unsigned long flags;



	if (!ndev || !netif_running(ndev))

		return 0;
@@ -4455,7 +4452,6 @@ int stmmac_resume(struct device *dev) 
{

	struct net_device *ndev = dev_get_drvdata(dev);

	struct stmmac_priv *priv = netdev_priv(ndev);

	unsigned long flags;



	if (!netif_running(ndev))

		return 0;