Re: [PATCH] staging: netlogic: Coding Style Alignment should match open parenthesis

2016-02-07 Thread Greg KH
On Sat, Dec 12, 2015 at 09:49:37PM -0800, Benjamin Young wrote:
> Fixed alignment issues with parenthesis so the code is easier to read.
> 
> Signed-off-by: Benjamin Young 
> ---
>  drivers/staging/netlogic/platform_net.c |  12 +--
>  drivers/staging/netlogic/xlr_net.c  | 159 
> +---
>  2 files changed, 91 insertions(+), 80 deletions(-)

Also does not apply :(


Re: [PATCH] staging: netlogic: Coding Style Alignment should match open parenthesis

2016-02-07 Thread Greg KH
On Sat, Dec 12, 2015 at 09:49:37PM -0800, Benjamin Young wrote:
> Fixed alignment issues with parenthesis so the code is easier to read.
> 
> Signed-off-by: Benjamin Young 
> ---
>  drivers/staging/netlogic/platform_net.c |  12 +--
>  drivers/staging/netlogic/xlr_net.c  | 159 
> +---
>  2 files changed, 91 insertions(+), 80 deletions(-)

Also does not apply :(


[PATCH] staging: netlogic: Coding Style Alignment should match open parenthesis

2015-12-12 Thread Benjamin Young
Fixed alignment issues with parenthesis so the code is easier to read.

Signed-off-by: Benjamin Young 
---
 drivers/staging/netlogic/platform_net.c |  12 +--
 drivers/staging/netlogic/xlr_net.c  | 159 +---
 2 files changed, 91 insertions(+), 80 deletions(-)

diff --git a/drivers/staging/netlogic/platform_net.c 
b/drivers/staging/netlogic/platform_net.c
index 7806c2b..f71e42a 100644
--- a/drivers/staging/netlogic/platform_net.c
+++ b/drivers/staging/netlogic/platform_net.c
@@ -121,8 +121,8 @@ static struct platform_device *gmac_controller2_init(void 
*gmac0_addr)
ndata1.phy_addr[mac] = mac + 4 + 0x10;
 
xlr_resource_init(_net1_res[mac * 2],
-   xlr_gmac_offsets[mac + 4],
-   xlr_gmac_irqs[mac + 4]);
+ xlr_gmac_offsets[mac + 4],
+ xlr_gmac_irqs[mac + 4]);
}
xlr_net_dev1.num_resources = 8;
 
@@ -169,7 +169,7 @@ static void xls_gmac_init(void)
xlr_net_dev0.num_resources = 2;
 
xlr_resource_init(_net0_res[0], xlr_gmac_offsets[0],
-   xlr_gmac_irqs[0]);
+ xlr_gmac_irqs[0]);
platform_device_register(_net_dev0);
 
/* second block is XAUI, not supported yet */
@@ -182,8 +182,8 @@ static void xls_gmac_init(void)
ndata0.phy_addr[mac] = mac + 0x10;
 
xlr_resource_init(_net0_res[mac * 2],
-   xlr_gmac_offsets[mac],
-   xlr_gmac_irqs[mac]);
+ xlr_gmac_offsets[mac],
+ xlr_gmac_irqs[mac]);
}
xlr_net_dev0.num_resources = 8;
platform_device_register(_net_dev0);
@@ -223,7 +223,7 @@ static void xlr_gmac_init(void)
ndata0.tx_stnid[mac] = FMN_STNID_GMAC0_TX0 + mac;
ndata0.phy_addr[mac] = mac;
xlr_resource_init(_net0_res[mac * 2], xlr_gmac_offsets[mac],
-   xlr_gmac_irqs[mac]);
+ xlr_gmac_irqs[mac]);
}
xlr_net_dev0.num_resources = 8;
xlr_net_dev0.resource = xlr_net0_res;
diff --git a/drivers/staging/netlogic/xlr_net.c 
b/drivers/staging/netlogic/xlr_net.c
index ac93e63..7c44acf 100644
--- a/drivers/staging/netlogic/xlr_net.c
+++ b/drivers/staging/netlogic/xlr_net.c
@@ -69,8 +69,8 @@ static inline u32 xlr_nae_rdreg(u32 __iomem *base, unsigned 
int reg)
return __raw_readl(base + reg);
 }
 
-static inline void xlr_reg_update(u32 *base_addr,
-   u32 off, u32 val, u32 mask)
+static inline void xlr_reg_update(u32 *base_addr, u32 off,
+ u32 val, u32 mask)
 {
u32 tmp;
 
@@ -122,8 +122,8 @@ static inline unsigned char *xlr_alloc_skb(void)
return skb->data;
 }
 
-static void xlr_net_fmn_handler(int bkt, int src_stnid, int size,
-   int code, struct nlm_fmn_msg *msg, void *arg)
+static void xlr_net_fmn_handler(int bkt, int src_stnid, int size, int code,
+   struct nlm_fmn_msg *msg, void *arg)
 {
struct sk_buff *skb;
void *skb_data = NULL;
@@ -247,7 +247,7 @@ static int xlr_net_stop(struct net_device *ndev)
 }
 
 static void xlr_make_tx_desc(struct nlm_fmn_msg *msg, unsigned long addr,
-   struct sk_buff *skb)
+struct sk_buff *skb)
 {
unsigned long physkb = virt_to_phys(skb);
int cpu_core = nlm_core_id();
@@ -275,7 +275,7 @@ static void __maybe_unused xlr_wakeup_queue(unsigned long 
dev)
 }
 
 static netdev_tx_t xlr_net_start_xmit(struct sk_buff *skb,
-   struct net_device *ndev)
+ struct net_device *ndev)
 {
struct nlm_fmn_msg msg;
struct xlr_net_priv *priv = netdev_priv(ndev);
@@ -304,10 +304,10 @@ static void xlr_hw_set_mac_addr(struct net_device *ndev)
 
/* set mac station address */
xlr_nae_wreg(priv->base_addr, R_MAC_ADDR0,
-   ((ndev->dev_addr[5] << 24) | (ndev->dev_addr[4] << 16) |
-   (ndev->dev_addr[3] << 8) | (ndev->dev_addr[2])));
+((ndev->dev_addr[5] << 24) | (ndev->dev_addr[4] << 16) |
+(ndev->dev_addr[3] << 8) | (ndev->dev_addr[2])));
xlr_nae_wreg(priv->base_addr, R_MAC_ADDR0 + 1,
-   ((ndev->dev_addr[1] << 24) | (ndev->dev_addr[0] << 16)));
+((ndev->dev_addr[1] << 24) | (ndev->dev_addr[0] << 16)));
 
xlr_nae_wreg(priv->base_addr, R_MAC_ADDR_MASK2, 0x);
xlr_nae_wreg(priv->base_addr, R_MAC_ADDR_MASK2 + 1, 0x);
@@ -315,12 +315,12 @@ static void xlr_hw_set_mac_addr(struct net_device *ndev)
xlr_nae_wreg(priv->base_addr, R_MAC_ADDR_MASK3 + 1, 

[PATCH] staging: netlogic: Coding Style Alignment should match open parenthesis

2015-12-12 Thread Benjamin Young
Fixed alignment issues with parenthesis so the code is easier to read.

Signed-off-by: Benjamin Young 
---
 drivers/staging/netlogic/platform_net.c |  12 +--
 drivers/staging/netlogic/xlr_net.c  | 159 +---
 2 files changed, 91 insertions(+), 80 deletions(-)

diff --git a/drivers/staging/netlogic/platform_net.c 
b/drivers/staging/netlogic/platform_net.c
index 7806c2b..f71e42a 100644
--- a/drivers/staging/netlogic/platform_net.c
+++ b/drivers/staging/netlogic/platform_net.c
@@ -121,8 +121,8 @@ static struct platform_device *gmac_controller2_init(void 
*gmac0_addr)
ndata1.phy_addr[mac] = mac + 4 + 0x10;
 
xlr_resource_init(_net1_res[mac * 2],
-   xlr_gmac_offsets[mac + 4],
-   xlr_gmac_irqs[mac + 4]);
+ xlr_gmac_offsets[mac + 4],
+ xlr_gmac_irqs[mac + 4]);
}
xlr_net_dev1.num_resources = 8;
 
@@ -169,7 +169,7 @@ static void xls_gmac_init(void)
xlr_net_dev0.num_resources = 2;
 
xlr_resource_init(_net0_res[0], xlr_gmac_offsets[0],
-   xlr_gmac_irqs[0]);
+ xlr_gmac_irqs[0]);
platform_device_register(_net_dev0);
 
/* second block is XAUI, not supported yet */
@@ -182,8 +182,8 @@ static void xls_gmac_init(void)
ndata0.phy_addr[mac] = mac + 0x10;
 
xlr_resource_init(_net0_res[mac * 2],
-   xlr_gmac_offsets[mac],
-   xlr_gmac_irqs[mac]);
+ xlr_gmac_offsets[mac],
+ xlr_gmac_irqs[mac]);
}
xlr_net_dev0.num_resources = 8;
platform_device_register(_net_dev0);
@@ -223,7 +223,7 @@ static void xlr_gmac_init(void)
ndata0.tx_stnid[mac] = FMN_STNID_GMAC0_TX0 + mac;
ndata0.phy_addr[mac] = mac;
xlr_resource_init(_net0_res[mac * 2], xlr_gmac_offsets[mac],
-   xlr_gmac_irqs[mac]);
+ xlr_gmac_irqs[mac]);
}
xlr_net_dev0.num_resources = 8;
xlr_net_dev0.resource = xlr_net0_res;
diff --git a/drivers/staging/netlogic/xlr_net.c 
b/drivers/staging/netlogic/xlr_net.c
index ac93e63..7c44acf 100644
--- a/drivers/staging/netlogic/xlr_net.c
+++ b/drivers/staging/netlogic/xlr_net.c
@@ -69,8 +69,8 @@ static inline u32 xlr_nae_rdreg(u32 __iomem *base, unsigned 
int reg)
return __raw_readl(base + reg);
 }
 
-static inline void xlr_reg_update(u32 *base_addr,
-   u32 off, u32 val, u32 mask)
+static inline void xlr_reg_update(u32 *base_addr, u32 off,
+ u32 val, u32 mask)
 {
u32 tmp;
 
@@ -122,8 +122,8 @@ static inline unsigned char *xlr_alloc_skb(void)
return skb->data;
 }
 
-static void xlr_net_fmn_handler(int bkt, int src_stnid, int size,
-   int code, struct nlm_fmn_msg *msg, void *arg)
+static void xlr_net_fmn_handler(int bkt, int src_stnid, int size, int code,
+   struct nlm_fmn_msg *msg, void *arg)
 {
struct sk_buff *skb;
void *skb_data = NULL;
@@ -247,7 +247,7 @@ static int xlr_net_stop(struct net_device *ndev)
 }
 
 static void xlr_make_tx_desc(struct nlm_fmn_msg *msg, unsigned long addr,
-   struct sk_buff *skb)
+struct sk_buff *skb)
 {
unsigned long physkb = virt_to_phys(skb);
int cpu_core = nlm_core_id();
@@ -275,7 +275,7 @@ static void __maybe_unused xlr_wakeup_queue(unsigned long 
dev)
 }
 
 static netdev_tx_t xlr_net_start_xmit(struct sk_buff *skb,
-   struct net_device *ndev)
+ struct net_device *ndev)
 {
struct nlm_fmn_msg msg;
struct xlr_net_priv *priv = netdev_priv(ndev);
@@ -304,10 +304,10 @@ static void xlr_hw_set_mac_addr(struct net_device *ndev)
 
/* set mac station address */
xlr_nae_wreg(priv->base_addr, R_MAC_ADDR0,
-   ((ndev->dev_addr[5] << 24) | (ndev->dev_addr[4] << 16) |
-   (ndev->dev_addr[3] << 8) | (ndev->dev_addr[2])));
+((ndev->dev_addr[5] << 24) | (ndev->dev_addr[4] << 16) |
+(ndev->dev_addr[3] << 8) | (ndev->dev_addr[2])));
xlr_nae_wreg(priv->base_addr, R_MAC_ADDR0 + 1,
-   ((ndev->dev_addr[1] << 24) | (ndev->dev_addr[0] << 16)));
+((ndev->dev_addr[1] << 24) | (ndev->dev_addr[0] << 16)));
 
xlr_nae_wreg(priv->base_addr, R_MAC_ADDR_MASK2, 0x);
xlr_nae_wreg(priv->base_addr, R_MAC_ADDR_MASK2 + 1, 0x);
@@ -315,12 +315,12 @@ static void xlr_hw_set_mac_addr(struct net_device *ndev)
xlr_nae_wreg(priv->base_addr,