1 files changed, 73 insertions, 73 deletions

diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c
index d646fbcd546a..5fc99cb10df0 100644
--- a/drivers/net/can/pch_can.c
+++ b/drivers/net/can/pch_can.c
@@ -245,23 +245,6 @@ static void pch_can_set_optmode(struct pch_can_priv *priv)
         iowrite32(reg_val, &priv->regs->opt);
 }
 
-static void pch_can_set_int_custom(struct pch_can_priv *priv)
-{
-        /* Clearing the IE, SIE and EIE bits of Can control register. */
-        pch_can_bit_clear(&priv->regs->cont, PCH_CTRL_IE_SIE_EIE);
-
-        /* Appropriately setting them. */
-        pch_can_bit_set(&priv->regs->cont,
-                        ((priv->int_enables & PCH_MSK_CTRL_IE_SIE_EIE) << 1));
-}
-
-/* This function retrieves interrupt enabled for the CAN device. */
-static void pch_can_get_int_enables(struct pch_can_priv *priv, u32 *enables)
-{
-        /* Obtaining the status of IE, SIE and EIE interrupt bits. */
-        *enables = ((ioread32(&priv->regs->cont) & PCH_CTRL_IE_SIE_EIE) >> 1);
-}
-
 static void pch_can_set_int_enables(struct pch_can_priv *priv,
                                     enum pch_can_mode interrupt_no)
 {
@@ -355,61 +338,11 @@ static void pch_can_set_tx_all(struct pch_can_priv *priv, u32 set)
                 pch_can_set_rxtx(priv, i, set, PCH_TX_IFREG);
 }
 
-static u32 pch_can_get_rxtx_ir(struct pch_can_priv *priv, u32 buff_num,
-                               enum pch_ifreg dir)
-{
-        u32 ie, enable;
-
-        if (dir)
-                ie = PCH_IF_MCONT_RXIE;
-        else
-                ie = PCH_IF_MCONT_TXIE;
-
-        iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[dir].cmask);
-        pch_can_check_if_busy(&priv->regs->ifregs[dir].creq, buff_num);
-
-        if (((ioread32(&priv->regs->ifregs[dir].id2)) & PCH_ID_MSGVAL) &&
-                        ((ioread32(&priv->regs->ifregs[dir].mcont)) & ie)) {
-                enable = 1;
-        } else {
-                enable = 0;
-        }
-        return enable;
-}
-
 static int pch_can_int_pending(struct pch_can_priv *priv)
 {
         return ioread32(&priv->regs->intr) & 0xffff;
 }
 
-static void pch_can_set_rx_buffer_link(struct pch_can_priv *priv,
-                                       u32 buffer_num, u32 set)
-{
-        iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[0].cmask);
-        pch_can_check_if_busy(&priv->regs->ifregs[0].creq, buffer_num);
-        iowrite32(PCH_CMASK_RDWR | PCH_CMASK_CTRL,
-                  &priv->regs->ifregs[0].cmask);
-        if (set == PCH_ENABLE)
-                pch_can_bit_clear(&priv->regs->ifregs[0].mcont,
-                                  PCH_IF_MCONT_EOB);
-        else
-                pch_can_bit_set(&priv->regs->ifregs[0].mcont, PCH_IF_MCONT_EOB);
-
-        pch_can_check_if_busy(&priv->regs->ifregs[0].creq, buffer_num);
-}
-
-static void pch_can_get_rx_buffer_link(struct pch_can_priv *priv,
-                                       u32 buffer_num, u32 *link)
-{
-        iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[0].cmask);
-        pch_can_check_if_busy(&priv->regs->ifregs[0].creq, buffer_num);
-
-        if (ioread32(&priv->regs->ifregs[0].mcont) & PCH_IF_MCONT_EOB)
-                *link = PCH_DISABLE;
-        else
-                *link = PCH_ENABLE;
-}
-
 static void pch_can_clear_buffers(struct pch_can_priv *priv)
 {
         int i;
@@ -583,12 +516,6 @@ static void pch_can_int_clr(struct pch_can_priv *priv, u32 mask)
         }
 }
 
-static int pch_can_get_buffer_status(struct pch_can_priv *priv)
-{
-        return (ioread32(&priv->regs->treq1) & 0xffff) |
-               ((ioread32(&priv->regs->treq2) & 0xffff) << 16);
-}
-
 static void pch_can_reset(struct pch_can_priv *priv)
 {
         /* write to sw reset register */
@@ -1109,6 +1036,79 @@ static void __devexit pch_can_remove(struct pci_dev *pdev)
 }
 
 #ifdef CONFIG_PM
+static void pch_can_set_int_custom(struct pch_can_priv *priv)
+{
+        /* Clearing the IE, SIE and EIE bits of Can control register. */
+        pch_can_bit_clear(&priv->regs->cont, PCH_CTRL_IE_SIE_EIE);
+
+        /* Appropriately setting them. */
+        pch_can_bit_set(&priv->regs->cont,
+                        ((priv->int_enables & PCH_MSK_CTRL_IE_SIE_EIE) << 1));
+}
+
+/* This function retrieves interrupt enabled for the CAN device. */
+static void pch_can_get_int_enables(struct pch_can_priv *priv, u32 *enables)
+{
+        /* Obtaining the status of IE, SIE and EIE interrupt bits. */
+        *enables = ((ioread32(&priv->regs->cont) & PCH_CTRL_IE_SIE_EIE) >> 1);
+}
+
+static u32 pch_can_get_rxtx_ir(struct pch_can_priv *priv, u32 buff_num,
+                               enum pch_ifreg dir)
+{
+        u32 ie, enable;
+
+        if (dir)
+                ie = PCH_IF_MCONT_RXIE;
+        else
+                ie = PCH_IF_MCONT_TXIE;
+
+        iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[dir].cmask);
+        pch_can_check_if_busy(&priv->regs->ifregs[dir].creq, buff_num);
+
+        if (((ioread32(&priv->regs->ifregs[dir].id2)) & PCH_ID_MSGVAL) &&
+                        ((ioread32(&priv->regs->ifregs[dir].mcont)) & ie)) {
+                enable = 1;
+        } else {
+                enable = 0;
+        }
+        return enable;
+}
+
+static void pch_can_set_rx_buffer_link(struct pch_can_priv *priv,
+                                       u32 buffer_num, u32 set)
+{
+        iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[0].cmask);
+        pch_can_check_if_busy(&priv->regs->ifregs[0].creq, buffer_num);
+        iowrite32(PCH_CMASK_RDWR | PCH_CMASK_CTRL,
+                  &priv->regs->ifregs[0].cmask);
+        if (set == PCH_ENABLE)
+                pch_can_bit_clear(&priv->regs->ifregs[0].mcont,
+                                  PCH_IF_MCONT_EOB);
+        else
+                pch_can_bit_set(&priv->regs->ifregs[0].mcont, PCH_IF_MCONT_EOB);
+
+        pch_can_check_if_busy(&priv->regs->ifregs[0].creq, buffer_num);
+}
+
+static void pch_can_get_rx_buffer_link(struct pch_can_priv *priv,
+                                       u32 buffer_num, u32 *link)
+{
+        iowrite32(PCH_CMASK_RX_TX_GET, &priv->regs->ifregs[0].cmask);
+        pch_can_check_if_busy(&priv->regs->ifregs[0].creq, buffer_num);
+
+        if (ioread32(&priv->regs->ifregs[0].mcont) & PCH_IF_MCONT_EOB)
+                *link = PCH_DISABLE;
+        else
+                *link = PCH_ENABLE;
+}
+
+static int pch_can_get_buffer_status(struct pch_can_priv *priv)
+{
+        return (ioread32(&priv->regs->treq1) & 0xffff) |
+               ((ioread32(&priv->regs->treq2) & 0xffff) << 16);
+}
+
 static int pch_can_suspend(struct pci_dev *pdev, pm_message_t state)
 {
         int i;                  /* Counter variable. */