struct clk *clk_ipg;
struct clk *clk_per;
-@@ -873,16 +873,15 @@ static struct sk_buff *flexcan_mailbox_r
+@@ -872,16 +872,15 @@ static struct sk_buff *flexcan_mailbox_r
return skb;
}
}
static irqreturn_t flexcan_irq(int irq, void *dev_id)
-@@ -1053,6 +1052,7 @@ static int flexcan_chip_start(struct net
+@@ -1052,6 +1051,7 @@ static int flexcan_chip_start(struct net
struct flexcan_priv *priv = netdev_priv(dev);
struct flexcan_regs __iomem *regs = priv->regs;
u32 reg_mcr, reg_ctrl, reg_ctrl2, reg_mecr;
int err, i;
struct flexcan_mb __iomem *mb;
-@@ -1227,8 +1227,9 @@ static int flexcan_chip_start(struct net
+@@ -1226,8 +1226,9 @@ static int flexcan_chip_start(struct net
/* enable interrupts atomically */
disable_irq(dev->irq);
priv->write(priv->reg_ctrl_default, ®s->ctrl);
enable_irq(dev->irq);
/* print chip status */
-@@ -1322,19 +1323,14 @@ static int flexcan_open(struct net_devic
+@@ -1321,19 +1322,14 @@ static int flexcan_open(struct net_devic
priv->offload.mailbox_read = flexcan_mailbox_read;
if (priv->devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP) {