]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging: et131x: Converting et1310_pm.c function and local names from CamelCase
authorMark Einon <mark.einon@gmail.com>
Sun, 10 Jul 2011 15:35:28 +0000 (16:35 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 23 Aug 2011 18:44:15 +0000 (11:44 -0700)
Tested on an ET-131x device.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/et131x/et1310_phy.c
drivers/staging/et131x/et1310_pm.c
drivers/staging/et131x/et131x.h
drivers/staging/et131x/et131x_initpci.c
drivers/staging/et131x/et131x_isr.c

index d53656bae840bf8797e61b22216e459534fa7c35..72892e06199b67a0fa92a9ce28e7fbde3600394b 100644 (file)
@@ -811,7 +811,7 @@ void et131x_mii_check(struct et131x_adapter *etdev,
                         * plugged back in
                         */
                        if (etdev->RegistryPhyComa == 1)
-                               EnablePhyComa(etdev);
+                               et1310_enable_phy_coma(etdev);
                }
        }
 
index 29d4d66d345f8f8764c9e54f171f1380abb54d27..1bfcc6705017111b099501ee2369b3be1d72a954 100644 (file)
@@ -87,7 +87,7 @@
 #include "et131x.h"
 
 /**
- * EnablePhyComa - called when network cable is unplugged
+ * et1310_enable_phy_coma - called when network cable is unplugged
  * @etdev: pointer to our adapter structure
  *
  * driver receive an phy status change interrupt while in D0 and check that
  *       indicating linkup status, call the MPDisablePhyComa routine to
  *             restore JAGCore and gigE PHY
  */
-void EnablePhyComa(struct et131x_adapter *etdev)
+void et1310_enable_phy_coma(struct et131x_adapter *etdev)
 {
        unsigned long flags;
        u32 pmcsr;
@@ -136,10 +136,10 @@ void EnablePhyComa(struct et131x_adapter *etdev)
 }
 
 /**
- * DisablePhyComa - Disable the Phy Coma Mode
+ * et1310_disable_phy_coma - Disable the Phy Coma Mode
  * @etdev: pointer to our adapter structure
  */
-void DisablePhyComa(struct et131x_adapter *etdev)
+void et1310_disable_phy_coma(struct et131x_adapter *etdev)
 {
        u32 pmcsr;
 
index c4f9032d6a13a1788dffd9ac4f8430e8ae8e7f65..240305e74c4502793ccca1482931c15282018f0a 100644 (file)
@@ -85,11 +85,11 @@ void setup_device_for_unicast(struct et131x_adapter *adapter);
 /* et131x_netdev.c */
 struct net_device *et131x_device_alloc(void);
 
-/* et131x_pm.c */
-void EnablePhyComa(struct et131x_adapter *adapter);
-void DisablePhyComa(struct et131x_adapter *adapter);
+/* et1310_pm.c */
+void et1310_enable_phy_coma(struct et131x_adapter *adapter);
+void et1310_disable_phy_coma(struct et131x_adapter *adapter);
 
-/* et131x_phy.c */
+/* et1310_phy.c */
 void et1310_phy_init(struct et131x_adapter *adapter);
 void et1310_phy_reset(struct et131x_adapter *adapter);
 void et1310_phy_power_down(struct et131x_adapter *adapter, bool down);
index 9b01f22c18b503c8648e45c298cd11ab55e6f358..c39f5f046a09e7ce02cf231d3f847410e1e20b7a 100644 (file)
@@ -288,7 +288,7 @@ void et131x_error_timer_handler(unsigned long data)
                                 *  interrupt'. How to do that under Linux?
                                 */
                                et131x_enable_interrupts(etdev);
-                               EnablePhyComa(etdev);
+                               et1310_enable_phy_coma(etdev);
                        }
                }
        }
index 0a810cce631d6f3639a9fbcc7b1950a7a02f9d1f..dd952f07e5ed7aabae03e1d74565e85fa1db886e 100644 (file)
@@ -379,7 +379,7 @@ void et131x_isr_handler(struct work_struct *work)
                                 * so, disable it because we will not be able
                                 * to read PHY values until we are out.
                                 */
-                               DisablePhyComa(etdev);
+                               et1310_disable_phy_coma(etdev);
                        }
 
                        /* Read the PHY ISR to clear the reason for the