aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Cotey <puff65537@bansheeslibrary.com>2012-09-15 09:10:49 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-17 08:37:58 -0400
commit1bd5374ddea7a47b1ec682ee912dc36680cde939 (patch)
tree9fb24abe20a0b32397b8218e6f06e8395507db2e
parent01448bbb05abb09fa74f5d15bf7388d8ac78700d (diff)
Staging: silicom: checkpatch.pl cleanup: pretty pointers
More notation fixes Signed-off-by: Daniel Cotey <puff65537@bansheeslibrary.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/silicom/bp_mod.c64
1 files changed, 32 insertions, 32 deletions
diff --git a/drivers/staging/silicom/bp_mod.c b/drivers/staging/silicom/bp_mod.c
index e133a8b647f9..b574c35192ae 100644
--- a/drivers/staging/silicom/bp_mod.c
+++ b/drivers/staging/silicom/bp_mod.c
@@ -1698,7 +1698,7 @@ int zero_set_fn(bpctl_dev_t *pbpctl_dev)
1698 return ctrl_value; 1698 return ctrl_value;
1699} 1699}
1700 1700
1701int pulse_get2_fn(bpctl_dev_t * pbpctl_dev) 1701int pulse_get2_fn(bpctl_dev_t *pbpctl_dev)
1702{ 1702{
1703 uint32_t ctrl_ext = 0, ctrl_value = 0; 1703 uint32_t ctrl_ext = 0, ctrl_value = 0;
1704 if (!pbpctl_dev) 1704 if (!pbpctl_dev)
@@ -1713,7 +1713,7 @@ int pulse_get2_fn(bpctl_dev_t * pbpctl_dev)
1713 return ctrl_value; 1713 return ctrl_value;
1714} 1714}
1715 1715
1716int pulse_get1_fn(bpctl_dev_t * pbpctl_dev) 1716int pulse_get1_fn(bpctl_dev_t *pbpctl_dev)
1717{ 1717{
1718 uint32_t ctrl_ext = 0, ctrl_value = 0; 1718 uint32_t ctrl_ext = 0, ctrl_value = 0;
1719 if (!pbpctl_dev) 1719 if (!pbpctl_dev)
@@ -1730,7 +1730,7 @@ int pulse_get1_fn(bpctl_dev_t * pbpctl_dev)
1730 return ctrl_value; 1730 return ctrl_value;
1731} 1731}
1732 1732
1733int gpio6_set_fn(bpctl_dev_t * pbpctl_dev) 1733int gpio6_set_fn(bpctl_dev_t *pbpctl_dev)
1734{ 1734{
1735 uint32_t ctrl_ext = 0; 1735 uint32_t ctrl_ext = 0;
1736 1736
@@ -1741,7 +1741,7 @@ int gpio6_set_fn(bpctl_dev_t * pbpctl_dev)
1741 return 0; 1741 return 0;
1742} 1742}
1743 1743
1744int gpio7_set_fn(bpctl_dev_t * pbpctl_dev) 1744int gpio7_set_fn(bpctl_dev_t *pbpctl_dev)
1745{ 1745{
1746 uint32_t ctrl_ext = 0; 1746 uint32_t ctrl_ext = 0;
1747 1747
@@ -1752,7 +1752,7 @@ int gpio7_set_fn(bpctl_dev_t * pbpctl_dev)
1752 return 0; 1752 return 0;
1753} 1753}
1754 1754
1755int gpio7_clear_fn(bpctl_dev_t * pbpctl_dev) 1755int gpio7_clear_fn(bpctl_dev_t *pbpctl_dev)
1756{ 1756{
1757 uint32_t ctrl_ext = 0; 1757 uint32_t ctrl_ext = 0;
1758 1758
@@ -1763,7 +1763,7 @@ int gpio7_clear_fn(bpctl_dev_t * pbpctl_dev)
1763 return 0; 1763 return 0;
1764} 1764}
1765 1765
1766int gpio6_clear_fn(bpctl_dev_t * pbpctl_dev) 1766int gpio6_clear_fn(bpctl_dev_t *pbpctl_dev)
1767{ 1767{
1768 uint32_t ctrl_ext = 0; 1768 uint32_t ctrl_ext = 0;
1769 1769
@@ -1775,7 +1775,7 @@ int gpio6_clear_fn(bpctl_dev_t * pbpctl_dev)
1775} 1775}
1776#endif /*BYPASS_DEBUG */ 1776#endif /*BYPASS_DEBUG */
1777 1777
1778static bpctl_dev_t *get_status_port_fn(bpctl_dev_t * pbpctl_dev) 1778static bpctl_dev_t *get_status_port_fn(bpctl_dev_t *pbpctl_dev)
1779{ 1779{
1780 int idx_dev = 0; 1780 int idx_dev = 0;
1781 1781
@@ -1805,7 +1805,7 @@ static bpctl_dev_t *get_status_port_fn(bpctl_dev_t * pbpctl_dev)
1805 return NULL; 1805 return NULL;
1806} 1806}
1807 1807
1808static bpctl_dev_t *get_master_port_fn(bpctl_dev_t * pbpctl_dev) 1808static bpctl_dev_t *get_master_port_fn(bpctl_dev_t *pbpctl_dev)
1809{ 1809{
1810 int idx_dev = 0; 1810 int idx_dev = 0;
1811 1811
@@ -1839,7 +1839,7 @@ static bpctl_dev_t *get_master_port_fn(bpctl_dev_t * pbpctl_dev)
1839/**************INTEL API***************/ 1839/**************INTEL API***************/
1840/**************************************/ 1840/**************************************/
1841 1841
1842static void write_data_port_int(bpctl_dev_t * pbpctl_dev, 1842static void write_data_port_int(bpctl_dev_t *pbpctl_dev,
1843 unsigned char ctrl_value) 1843 unsigned char ctrl_value)
1844{ 1844{
1845 uint32_t value; 1845 uint32_t value;
@@ -1864,7 +1864,7 @@ static void write_data_port_int(bpctl_dev_t * pbpctl_dev,
1864 1864
1865} 1865}
1866 1866
1867static int write_data_int(bpctl_dev_t * pbpctl_dev, unsigned char value) 1867static int write_data_int(bpctl_dev_t *pbpctl_dev, unsigned char value)
1868{ 1868{
1869 bpctl_dev_t *pbpctl_dev_b = NULL; 1869 bpctl_dev_t *pbpctl_dev_b = NULL;
1870 1870
@@ -1878,7 +1878,7 @@ static int write_data_int(bpctl_dev_t * pbpctl_dev, unsigned char value)
1878 return 0; 1878 return 0;
1879} 1879}
1880 1880
1881static int wdt_pulse_int(bpctl_dev_t * pbpctl_dev) 1881static int wdt_pulse_int(bpctl_dev_t *pbpctl_dev)
1882{ 1882{
1883 1883
1884 if ((atomic_read(&pbpctl_dev->wdt_busy)) == 1) 1884 if ((atomic_read(&pbpctl_dev->wdt_busy)) == 1)
@@ -1902,7 +1902,7 @@ static int wdt_pulse_int(bpctl_dev_t * pbpctl_dev)
1902/*************************************/ 1902/*************************************/
1903 1903
1904/* CMND_ON 0x4 (100)*/ 1904/* CMND_ON 0x4 (100)*/
1905int cmnd_on(bpctl_dev_t * pbpctl_dev) 1905int cmnd_on(bpctl_dev_t *pbpctl_dev)
1906{ 1906{
1907 int ret = BP_NOT_CAP; 1907 int ret = BP_NOT_CAP;
1908 1908
@@ -1919,7 +1919,7 @@ int cmnd_on(bpctl_dev_t * pbpctl_dev)
1919} 1919}
1920 1920
1921/* CMND_OFF 0x2 (10)*/ 1921/* CMND_OFF 0x2 (10)*/
1922int cmnd_off(bpctl_dev_t * pbpctl_dev) 1922int cmnd_off(bpctl_dev_t *pbpctl_dev)
1923{ 1923{
1924 int ret = BP_NOT_CAP; 1924 int ret = BP_NOT_CAP;
1925 1925
@@ -1937,7 +1937,7 @@ int cmnd_off(bpctl_dev_t * pbpctl_dev)
1937} 1937}
1938 1938
1939/* BYPASS_ON (0xa)*/ 1939/* BYPASS_ON (0xa)*/
1940int bypass_on(bpctl_dev_t * pbpctl_dev) 1940int bypass_on(bpctl_dev_t *pbpctl_dev)
1941{ 1941{
1942 int ret = BP_NOT_CAP; 1942 int ret = BP_NOT_CAP;
1943 1943
@@ -1958,7 +1958,7 @@ int bypass_on(bpctl_dev_t * pbpctl_dev)
1958} 1958}
1959 1959
1960/* BYPASS_OFF (0x8 111)*/ 1960/* BYPASS_OFF (0x8 111)*/
1961int bypass_off(bpctl_dev_t * pbpctl_dev) 1961int bypass_off(bpctl_dev_t *pbpctl_dev)
1962{ 1962{
1963 int ret = BP_NOT_CAP; 1963 int ret = BP_NOT_CAP;
1964 1964
@@ -1981,7 +1981,7 @@ int bypass_off(bpctl_dev_t * pbpctl_dev)
1981} 1981}
1982 1982
1983/* TAP_OFF (0x9)*/ 1983/* TAP_OFF (0x9)*/
1984int tap_off(bpctl_dev_t * pbpctl_dev) 1984int tap_off(bpctl_dev_t *pbpctl_dev)
1985{ 1985{
1986 int ret = BP_NOT_CAP; 1986 int ret = BP_NOT_CAP;
1987 if ((pbpctl_dev->bp_caps & TAP_CAP) 1987 if ((pbpctl_dev->bp_caps & TAP_CAP)
@@ -1994,7 +1994,7 @@ int tap_off(bpctl_dev_t * pbpctl_dev)
1994} 1994}
1995 1995
1996/* TAP_ON (0xb)*/ 1996/* TAP_ON (0xb)*/
1997int tap_on(bpctl_dev_t * pbpctl_dev) 1997int tap_on(bpctl_dev_t *pbpctl_dev)
1998{ 1998{
1999 int ret = BP_NOT_CAP; 1999 int ret = BP_NOT_CAP;
2000 if ((pbpctl_dev->bp_caps & TAP_CAP) 2000 if ((pbpctl_dev->bp_caps & TAP_CAP)
@@ -2007,7 +2007,7 @@ int tap_on(bpctl_dev_t * pbpctl_dev)
2007} 2007}
2008 2008
2009/* DISC_OFF (0x9)*/ 2009/* DISC_OFF (0x9)*/
2010int disc_off(bpctl_dev_t * pbpctl_dev) 2010int disc_off(bpctl_dev_t *pbpctl_dev)
2011{ 2011{
2012 int ret = 0; 2012 int ret = 0;
2013 if ((pbpctl_dev->bp_caps & DISC_CAP) && (pbpctl_dev->bp_ext_ver >= 0x8)) { 2013 if ((pbpctl_dev->bp_caps & DISC_CAP) && (pbpctl_dev->bp_ext_ver >= 0x8)) {
@@ -2019,7 +2019,7 @@ int disc_off(bpctl_dev_t * pbpctl_dev)
2019} 2019}
2020 2020
2021/* DISC_ON (0xb)*/ 2021/* DISC_ON (0xb)*/
2022int disc_on(bpctl_dev_t * pbpctl_dev) 2022int disc_on(bpctl_dev_t *pbpctl_dev)
2023{ 2023{
2024 int ret = 0; 2024 int ret = 0;
2025 if ((pbpctl_dev->bp_caps & DISC_CAP) && (pbpctl_dev->bp_ext_ver >= 0x8)) { 2025 if ((pbpctl_dev->bp_caps & DISC_CAP) && (pbpctl_dev->bp_ext_ver >= 0x8)) {
@@ -2031,7 +2031,7 @@ int disc_on(bpctl_dev_t * pbpctl_dev)
2031} 2031}
2032 2032
2033/* DISC_PORT_ON */ 2033/* DISC_PORT_ON */
2034int disc_port_on(bpctl_dev_t * pbpctl_dev) 2034int disc_port_on(bpctl_dev_t *pbpctl_dev)
2035{ 2035{
2036 int ret = 0; 2036 int ret = 0;
2037 bpctl_dev_t *pbpctl_dev_m; 2037 bpctl_dev_t *pbpctl_dev_m;
@@ -2059,7 +2059,7 @@ int disc_port_on(bpctl_dev_t * pbpctl_dev)
2059} 2059}
2060 2060
2061/* DISC_PORT_OFF */ 2061/* DISC_PORT_OFF */
2062int disc_port_off(bpctl_dev_t * pbpctl_dev) 2062int disc_port_off(bpctl_dev_t *pbpctl_dev)
2063{ 2063{
2064 int ret = 0; 2064 int ret = 0;
2065 bpctl_dev_t *pbpctl_dev_m; 2065 bpctl_dev_t *pbpctl_dev_m;
@@ -2084,7 +2084,7 @@ int disc_port_off(bpctl_dev_t * pbpctl_dev)
2084} 2084}
2085 2085
2086/*TWO_PORT_LINK_HW_EN (0xe)*/ 2086/*TWO_PORT_LINK_HW_EN (0xe)*/
2087int tpl_hw_on(bpctl_dev_t * pbpctl_dev) 2087int tpl_hw_on(bpctl_dev_t *pbpctl_dev)
2088{ 2088{
2089 int ret = 0, ctrl = 0; 2089 int ret = 0, ctrl = 0;
2090 bpctl_dev_t *pbpctl_dev_b = NULL; 2090 bpctl_dev_t *pbpctl_dev_b = NULL;
@@ -2111,7 +2111,7 @@ int tpl_hw_on(bpctl_dev_t * pbpctl_dev)
2111} 2111}
2112 2112
2113/*TWO_PORT_LINK_HW_DIS (0xc)*/ 2113/*TWO_PORT_LINK_HW_DIS (0xc)*/
2114int tpl_hw_off(bpctl_dev_t * pbpctl_dev) 2114int tpl_hw_off(bpctl_dev_t *pbpctl_dev)
2115{ 2115{
2116 int ret = 0, ctrl = 0; 2116 int ret = 0, ctrl = 0;
2117 bpctl_dev_t *pbpctl_dev_b = NULL; 2117 bpctl_dev_t *pbpctl_dev_b = NULL;
@@ -2136,7 +2136,7 @@ int tpl_hw_off(bpctl_dev_t * pbpctl_dev)
2136} 2136}
2137 2137
2138/* WDT_OFF (0x6 110)*/ 2138/* WDT_OFF (0x6 110)*/
2139int wdt_off(bpctl_dev_t * pbpctl_dev) 2139int wdt_off(bpctl_dev_t *pbpctl_dev)
2140{ 2140{
2141 int ret = BP_NOT_CAP; 2141 int ret = BP_NOT_CAP;
2142 2142
@@ -2159,7 +2159,7 @@ int wdt_off(bpctl_dev_t * pbpctl_dev)
2159static unsigned int 2159static unsigned int
2160 wdt_val_array[] = { 1000, 1500, 2000, 3000, 4000, 8000, 16000, 32000, 0 }; 2160 wdt_val_array[] = { 1000, 1500, 2000, 3000, 4000, 8000, 16000, 32000, 0 };
2161 2161
2162int wdt_on(bpctl_dev_t * pbpctl_dev, unsigned int timeout) 2162int wdt_on(bpctl_dev_t *pbpctl_dev, unsigned int timeout)
2163{ 2163{
2164 2164
2165 if (pbpctl_dev->bp_caps & WD_CTL_CAP) { 2165 if (pbpctl_dev->bp_caps & WD_CTL_CAP) {
@@ -2211,7 +2211,7 @@ int wdt_on(bpctl_dev_t * pbpctl_dev, unsigned int timeout)
2211 return BP_NOT_CAP; 2211 return BP_NOT_CAP;
2212} 2212}
2213 2213
2214void bp75_put_hw_semaphore_generic(bpctl_dev_t * pbpctl_dev) 2214void bp75_put_hw_semaphore_generic(bpctl_dev_t *pbpctl_dev)
2215{ 2215{
2216 u32 swsm; 2216 u32 swsm;
2217 2217
@@ -2222,7 +2222,7 @@ void bp75_put_hw_semaphore_generic(bpctl_dev_t * pbpctl_dev)
2222 BPCTL_WRITE_REG(pbpctl_dev, SWSM, swsm); 2222 BPCTL_WRITE_REG(pbpctl_dev, SWSM, swsm);
2223} 2223}
2224 2224
2225s32 bp75_get_hw_semaphore_generic(bpctl_dev_t * pbpctl_dev) 2225s32 bp75_get_hw_semaphore_generic(bpctl_dev_t *pbpctl_dev)
2226{ 2226{
2227 u32 swsm; 2227 u32 swsm;
2228 s32 ret_val = 0; 2228 s32 ret_val = 0;
@@ -2270,7 +2270,7 @@ s32 bp75_get_hw_semaphore_generic(bpctl_dev_t * pbpctl_dev)
2270 return ret_val; 2270 return ret_val;
2271} 2271}
2272 2272
2273static void bp75_release_phy(bpctl_dev_t * pbpctl_dev) 2273static void bp75_release_phy(bpctl_dev_t *pbpctl_dev)
2274{ 2274{
2275 u16 mask = BPCTLI_SWFW_PHY0_SM; 2275 u16 mask = BPCTLI_SWFW_PHY0_SM;
2276 u32 swfw_sync; 2276 u32 swfw_sync;
@@ -2288,7 +2288,7 @@ static void bp75_release_phy(bpctl_dev_t * pbpctl_dev)
2288 bp75_put_hw_semaphore_generic(pbpctl_dev); 2288 bp75_put_hw_semaphore_generic(pbpctl_dev);
2289} 2289}
2290 2290
2291static s32 bp75_acquire_phy(bpctl_dev_t * pbpctl_dev) 2291static s32 bp75_acquire_phy(bpctl_dev_t *pbpctl_dev)
2292{ 2292{
2293 u16 mask = BPCTLI_SWFW_PHY0_SM; 2293 u16 mask = BPCTLI_SWFW_PHY0_SM;
2294 u32 swfw_sync; 2294 u32 swfw_sync;
@@ -2334,7 +2334,7 @@ static s32 bp75_acquire_phy(bpctl_dev_t * pbpctl_dev)
2334 return ret_val; 2334 return ret_val;
2335} 2335}
2336 2336
2337s32 bp75_read_phy_reg_mdic(bpctl_dev_t * pbpctl_dev, u32 offset, u16 * data) 2337s32 bp75_read_phy_reg_mdic(bpctl_dev_t *pbpctl_dev, u32 offset, u16 *data)
2338{ 2338{
2339 u32 i, mdic = 0; 2339 u32 i, mdic = 0;
2340 s32 ret_val = 0; 2340 s32 ret_val = 0;
@@ -2367,7 +2367,7 @@ s32 bp75_read_phy_reg_mdic(bpctl_dev_t * pbpctl_dev, u32 offset, u16 * data)
2367 return ret_val; 2367 return ret_val;
2368} 2368}
2369 2369
2370s32 bp75_write_phy_reg_mdic(bpctl_dev_t * pbpctl_dev, u32 offset, u16 data) 2370s32 bp75_write_phy_reg_mdic(bpctl_dev_t *pbpctl_dev, u32 offset, u16 data)
2371{ 2371{
2372 u32 i, mdic = 0; 2372 u32 i, mdic = 0;
2373 s32 ret_val = 0; 2373 s32 ret_val = 0;
@@ -2400,7 +2400,7 @@ s32 bp75_write_phy_reg_mdic(bpctl_dev_t * pbpctl_dev, u32 offset, u16 data)
2400 return ret_val; 2400 return ret_val;
2401} 2401}
2402 2402
2403static s32 bp75_read_phy_reg(bpctl_dev_t * pbpctl_dev, u32 offset, u16 * data) 2403static s32 bp75_read_phy_reg(bpctl_dev_t *pbpctl_dev, u32 offset, u16 *data)
2404{ 2404{
2405 s32 ret_val = 0; 2405 s32 ret_val = 0;
2406 2406