Skip to content

Commit

Permalink
staging: et131x: Converting et1310_pm.c function and local names from…
Browse files Browse the repository at this point in the history
… CamelCase

Tested on an ET-131x device.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Mark Einon authored and Greg Kroah-Hartman committed Aug 23, 2011
1 parent 99fa7e1 commit c2329af
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion drivers/staging/et131x/et1310_phy.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
8 changes: 4 additions & 4 deletions drivers/staging/et131x/et1310_pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -106,7 +106,7 @@
* 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;
Expand Down Expand Up @@ -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;

Expand Down
8 changes: 4 additions & 4 deletions drivers/staging/et131x/et131x.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/et131x/et131x_initpci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/et131x/et131x_isr.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c2329af

Please sign in to comment.