summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergio Paracuellos <sergio.paracuellos@gmail.com>2016-11-18 18:58:10 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-11-19 14:24:23 +0100
commit608859b6b86b09fd446bde0dca8aa531ee701680 (patch)
tree530c2ac738a30df900a4071bcf654d9f6b48d13c
parent1081bb83a1c5da9ee89f7e31335318aeff0e9794 (diff)
downloadlinux-608859b6b86b09fd446bde0dca8aa531ee701680.tar.gz
linux-608859b6b86b09fd446bde0dca8aa531ee701680.tar.bz2
linux-608859b6b86b09fd446bde0dca8aa531ee701680.zip
staging: slicoss: avoid CamelCases slicoss.c
Replace CamelCases to comply with the standard kernel coding style. Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/slicoss/slicoss.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
index 4d8d8809592b..99e9084200ed 100644
--- a/drivers/staging/slicoss/slicoss.c
+++ b/drivers/staging/slicoss/slicoss.c
@@ -629,15 +629,15 @@ static void slic_mac_config(struct adapter *adapter)
static void slic_config_set(struct adapter *adapter, bool linkchange)
{
u32 value;
- u32 RcrReset;
+ u32 rcr_reset;
if (linkchange) {
/* Setup MAC */
slic_mac_config(adapter);
- RcrReset = GRCR_RESET;
+ rcr_reset = GRCR_RESET;
} else {
slic_mac_address_config(adapter);
- RcrReset = 0;
+ rcr_reset = 0;
}
if (adapter->linkduplex == LINK_FULLD) {
@@ -649,7 +649,7 @@ static void slic_config_set(struct adapter *adapter, bool linkchange)
slic_write32(adapter, SLIC_REG_WXCFG, value);
/* Setup rcvcfg last */
- value = (RcrReset | /* Reset, if linkchange */
+ value = (rcr_reset | /* Reset, if linkchange */
GRCR_CTLEN | /* Enable CTL frames */
GRCR_ADDRAEN | /* Address A enable */
GRCR_RCVBAD | /* Rcv bad frames */
@@ -662,7 +662,7 @@ static void slic_config_set(struct adapter *adapter, bool linkchange)
slic_write32(adapter, SLIC_REG_WXCFG, value);
/* Setup rcvcfg last */
- value = (RcrReset | /* Reset, if linkchange */
+ value = (rcr_reset | /* Reset, if linkchange */
GRCR_ADDRAEN | /* Address A enable */
GRCR_RCVBAD | /* Rcv bad frames */
(GRCR_HASHSIZE << GRCR_HASHSIZE_SHIFT));
@@ -2585,7 +2585,7 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
struct slic_shmemory *sm = &adapter->shmem;
struct slic_shmem_data *sm_data = sm->shmem_data;
struct slic_eeprom *peeprom;
- struct oslic_eeprom *pOeeprom;
+ struct oslic_eeprom *poeeprom;
dma_addr_t phys_config;
u32 phys_configh;
u32 phys_configl;
@@ -2681,14 +2681,14 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
/* Oasis card */
case SLIC_2GB_DEVICE_ID:
/* extract EEPROM data and pointers to EEPROM data */
- pOeeprom = (struct oslic_eeprom *)peeprom;
- eecodesize = pOeeprom->eecode_size;
- dramsize = pOeeprom->dram_size;
- pmac = pOeeprom->mac_info;
- fruformat = pOeeprom->fru_format;
- patkfru = &pOeeprom->atk_fru;
- oemfruformat = pOeeprom->oem_fru_format;
- poemfru = &pOeeprom->oem_fru;
+ poeeprom = (struct oslic_eeprom *)peeprom;
+ eecodesize = poeeprom->eecode_size;
+ dramsize = poeeprom->dram_size;
+ pmac = poeeprom->mac_info;
+ fruformat = poeeprom->fru_format;
+ patkfru = &poeeprom->atk_fru;
+ oemfruformat = poeeprom->oem_fru_format;
+ poemfru = &poeeprom->oem_fru;
macaddrs = 2;
/*
* Minor kludge for Oasis card