Commit 270fe2ce authored by Chen Zhou's avatar Chen Zhou Committed by David S. Miller

net/wan/fsl_ucc_hdlc: remove set but not used variables 'ut_info' and 'ret'

Fixes gcc '-Wunused-but-set-variable' warning:

drivers/net/wan/fsl_ucc_hdlc.c: In function ucc_hdlc_irq_handler:
drivers/net/wan/fsl_ucc_hdlc.c:643:23:
	warning: variable ut_info set but not used [-Wunused-but-set-variable]
drivers/net/wan/fsl_ucc_hdlc.c: In function uhdlc_suspend:
drivers/net/wan/fsl_ucc_hdlc.c:880:23:
	warning: variable ut_info set but not used [-Wunused-but-set-variable]
drivers/net/wan/fsl_ucc_hdlc.c: In function uhdlc_resume:
drivers/net/wan/fsl_ucc_hdlc.c:925:6:
	warning: variable ret set but not used [-Wunused-but-set-variable]
Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarChen Zhou <chenzhou10@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1b3b289f
...@@ -635,11 +635,9 @@ static irqreturn_t ucc_hdlc_irq_handler(int irq, void *dev_id) ...@@ -635,11 +635,9 @@ static irqreturn_t ucc_hdlc_irq_handler(int irq, void *dev_id)
struct ucc_hdlc_private *priv = (struct ucc_hdlc_private *)dev_id; struct ucc_hdlc_private *priv = (struct ucc_hdlc_private *)dev_id;
struct net_device *dev = priv->ndev; struct net_device *dev = priv->ndev;
struct ucc_fast_private *uccf; struct ucc_fast_private *uccf;
struct ucc_tdm_info *ut_info;
u32 ucce; u32 ucce;
u32 uccm; u32 uccm;
ut_info = priv->ut_info;
uccf = priv->uccf; uccf = priv->uccf;
ucce = ioread32be(uccf->p_ucce); ucce = ioread32be(uccf->p_ucce);
...@@ -872,7 +870,6 @@ static void resume_clk_config(struct ucc_hdlc_private *priv) ...@@ -872,7 +870,6 @@ static void resume_clk_config(struct ucc_hdlc_private *priv)
static int uhdlc_suspend(struct device *dev) static int uhdlc_suspend(struct device *dev)
{ {
struct ucc_hdlc_private *priv = dev_get_drvdata(dev); struct ucc_hdlc_private *priv = dev_get_drvdata(dev);
struct ucc_tdm_info *ut_info;
struct ucc_fast __iomem *uf_regs; struct ucc_fast __iomem *uf_regs;
if (!priv) if (!priv)
...@@ -884,7 +881,6 @@ static int uhdlc_suspend(struct device *dev) ...@@ -884,7 +881,6 @@ static int uhdlc_suspend(struct device *dev)
netif_device_detach(priv->ndev); netif_device_detach(priv->ndev);
napi_disable(&priv->napi); napi_disable(&priv->napi);
ut_info = priv->ut_info;
uf_regs = priv->uf_regs; uf_regs = priv->uf_regs;
/* backup gumr guemr*/ /* backup gumr guemr*/
...@@ -917,7 +913,7 @@ static int uhdlc_resume(struct device *dev) ...@@ -917,7 +913,7 @@ static int uhdlc_resume(struct device *dev)
struct ucc_fast __iomem *uf_regs; struct ucc_fast __iomem *uf_regs;
struct ucc_fast_private *uccf; struct ucc_fast_private *uccf;
struct ucc_fast_info *uf_info; struct ucc_fast_info *uf_info;
int ret, i; int i;
u32 cecr_subblock; u32 cecr_subblock;
u16 bd_status; u16 bd_status;
...@@ -962,16 +958,16 @@ static int uhdlc_resume(struct device *dev) ...@@ -962,16 +958,16 @@ static int uhdlc_resume(struct device *dev)
/* Write to QE CECR, UCCx channel to Stop Transmission */ /* Write to QE CECR, UCCx channel to Stop Transmission */
cecr_subblock = ucc_fast_get_qe_cr_subblock(uf_info->ucc_num); cecr_subblock = ucc_fast_get_qe_cr_subblock(uf_info->ucc_num);
ret = qe_issue_cmd(QE_STOP_TX, cecr_subblock, qe_issue_cmd(QE_STOP_TX, cecr_subblock,
(u8)QE_CR_PROTOCOL_UNSPECIFIED, 0); (u8)QE_CR_PROTOCOL_UNSPECIFIED, 0);
/* Set UPSMR normal mode */ /* Set UPSMR normal mode */
iowrite32be(0, &uf_regs->upsmr); iowrite32be(0, &uf_regs->upsmr);
/* init parameter base */ /* init parameter base */
cecr_subblock = ucc_fast_get_qe_cr_subblock(uf_info->ucc_num); cecr_subblock = ucc_fast_get_qe_cr_subblock(uf_info->ucc_num);
ret = qe_issue_cmd(QE_ASSIGN_PAGE_TO_DEVICE, cecr_subblock, qe_issue_cmd(QE_ASSIGN_PAGE_TO_DEVICE, cecr_subblock,
QE_CR_PROTOCOL_UNSPECIFIED, priv->ucc_pram_offset); QE_CR_PROTOCOL_UNSPECIFIED, priv->ucc_pram_offset);
priv->ucc_pram = (struct ucc_hdlc_param __iomem *) priv->ucc_pram = (struct ucc_hdlc_param __iomem *)
qe_muram_addr(priv->ucc_pram_offset); qe_muram_addr(priv->ucc_pram_offset);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment