Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux-2.6-microblaze.git] / drivers / net / wan / fsl_ucc_hdlc.c

diff --git a/drivers/net/wan/fsl_ucc_hdlc.c b/drivers/net/wan/fsl_ucc_hdlc.c
index f029eaa..9edd946 100644 (file)
--- a/drivers/net/wan/fsl_ucc_hdlc.c
+++ b/drivers/net/wan/fsl_ucc_hdlc.c
@@ -73,7 +73,7 @@ static struct ucc_tdm_info utdm_primary_info = {
        },
 };
 
-static struct ucc_tdm_info utdm_info[MAX_HDLC_NUM];
+static struct ucc_tdm_info utdm_info[UCC_MAX_NUM];
 
 static int uhdlc_init(struct ucc_hdlc_private *priv)
 {
@@ -640,11 +640,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);
@@ -877,7 +875,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)
@@ -889,7 +886,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*/
@@ -922,7 +918,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;
 
@@ -967,16 +963,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);
@@ -1044,7 +1040,7 @@ static const struct dev_pm_ops uhdlc_pm_ops = {
 #define HDLC_PM_OPS NULL
 
 #endif
-static void uhdlc_tx_timeout(struct net_device *ndev)
+static void uhdlc_tx_timeout(struct net_device *ndev, unsigned int txqueue)
 {
        netdev_err(ndev, "%s\n", __func__);
 }