Skip to content

Commit

Permalink
net/wan/fsl_ucc_hdlc: remove set but not used variables 'ut_info' and…
Browse files Browse the repository at this point in the history
… '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: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Chen Zhou <chenzhou10@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Chen Zhou authored and David S. Miller committed Dec 28, 2019
1 parent 1b3b289 commit 270fe2c
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions drivers/net/wan/fsl_ucc_hdlc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 net_device *dev = priv->ndev;
struct ucc_fast_private *uccf;
struct ucc_tdm_info *ut_info;
u32 ucce;
u32 uccm;

ut_info = priv->ut_info;
uccf = priv->uccf;

ucce = ioread32be(uccf->p_ucce);
Expand Down Expand Up @@ -872,7 +870,6 @@ static void resume_clk_config(struct ucc_hdlc_private *priv)
static int uhdlc_suspend(struct device *dev)
{
struct ucc_hdlc_private *priv = dev_get_drvdata(dev);
struct ucc_tdm_info *ut_info;
struct ucc_fast __iomem *uf_regs;

if (!priv)
Expand All @@ -884,7 +881,6 @@ static int uhdlc_suspend(struct device *dev)
netif_device_detach(priv->ndev);
napi_disable(&priv->napi);

ut_info = priv->ut_info;
uf_regs = priv->uf_regs;

/* backup gumr guemr*/
Expand Down Expand Up @@ -917,7 +913,7 @@ static int uhdlc_resume(struct device *dev)
struct ucc_fast __iomem *uf_regs;
struct ucc_fast_private *uccf;
struct ucc_fast_info *uf_info;
int ret, i;
int i;
u32 cecr_subblock;
u16 bd_status;

Expand Down Expand Up @@ -962,16 +958,16 @@ static int uhdlc_resume(struct device *dev)

/* Write to QE CECR, UCCx channel to Stop Transmission */
cecr_subblock = ucc_fast_get_qe_cr_subblock(uf_info->ucc_num);
ret = qe_issue_cmd(QE_STOP_TX, cecr_subblock,
(u8)QE_CR_PROTOCOL_UNSPECIFIED, 0);
qe_issue_cmd(QE_STOP_TX, cecr_subblock,
(u8)QE_CR_PROTOCOL_UNSPECIFIED, 0);

/* Set UPSMR normal mode */
iowrite32be(0, &uf_regs->upsmr);

/* init parameter base */
cecr_subblock = ucc_fast_get_qe_cr_subblock(uf_info->ucc_num);
ret = qe_issue_cmd(QE_ASSIGN_PAGE_TO_DEVICE, cecr_subblock,
QE_CR_PROTOCOL_UNSPECIFIED, priv->ucc_pram_offset);
qe_issue_cmd(QE_ASSIGN_PAGE_TO_DEVICE, cecr_subblock,
QE_CR_PROTOCOL_UNSPECIFIED, priv->ucc_pram_offset);

priv->ucc_pram = (struct ucc_hdlc_param __iomem *)
qe_muram_addr(priv->ucc_pram_offset);
Expand Down

0 comments on commit 270fe2c

Please sign in to comment.