Skip to contentSkip to conversation

Staging: octeon: Fixing coding style for minor notices.

PATCH In review Georgios Tsotsos 2 participants 3 messages Jul 29, 2018 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Staging: octeon: Fixing coding style for minor notices.

Fixing coding style for a few lines that were reported to check from checkpatch.pl in minor cases for alignment and ending with parenthesis.

---
 drivers/staging/octeon/ethernet.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/staging/octeon/ethernet.c +5 -5
index 9b15c9ed844b..1e258deecacc 100644
@@ -141,8 +141,8 @@ static void cvm_oct_periodic_worker(struct work_struct *work)
 	if (priv->poll)
 		priv->poll(cvm_oct_device[priv->port]);
 
-	cvm_oct_device[priv->port]->netdev_ops->ndo_get_stats(
-						cvm_oct_device[priv->port]);
+	cvm_oct_device[priv->port]->netdev_ops
+				->ndo_get_stats(cvm_oct_device[priv->port]);
 
 	if (!atomic_read(&cvm_oct_poll_queue_stopping))
 		schedule_delayed_work(&priv->port_periodic_work, HZ);
@@ -621,8 +621,8 @@ static const struct net_device_ops cvm_oct_pow_netdev_ops = {
 #endif
 };
 
-static struct device_node *cvm_oct_of_get_child(
-				const struct device_node *parent, int reg_val)
+static struct device_node *cvm_oct_of_get_child(const struct device_node *parent
+						, int reg_val)
 {
 	struct device_node *node = NULL;
 	int size;
@@ -818,7 +818,7 @@ static int cvm_oct_probe(struct platform_device *pdev)
 			priv = netdev_priv(dev);
 			priv->netdev = dev;
 			priv->of_node = cvm_oct_node_for_port(pip, interface,
-								port_index);
+							      port_index);
 
 			INIT_DELAYED_WORK(&priv->port_periodic_work,
 					  cvm_oct_periodic_worker);
Signature · 1 line
2.16.4
#1 lore raw
Quoted 13 lines · Georgios Tsotsos

Fixing coding style for a few lines that were reported to check from checkpatch.pl in minor cases for alignment and ending with parenthesis.

---
 drivers/staging/octeon/ethernet.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/staging/octeon/ethernet.c +0 -0
index 9b15c9ed844b..1e258deecacc 100644

drivers/staging/octeon/ethernet.c static void cvm_oct_periodic_worker(struct work_struct *work) · line 148

Quoted 10 lines
drivers/staging/octeon/ethernet.c +2 -2
@@ -141,8 +141,8 @@ static void cvm_oct_periodic_worker(struct work_struct *work)
 	if (priv->poll)
 		priv->poll(cvm_oct_device[priv->port]);
 
-	cvm_oct_device[priv->port]->netdev_ops->ndo_get_stats(
-						cvm_oct_device[priv->port]);
+	cvm_oct_device[priv->port]->netdev_ops
+				->ndo_get_stats(cvm_oct_device[priv->port]);
 
 	if (!atomic_read(&cvm_oct_poll_queue_stopping))
 		schedule_delayed_work(&priv->port_periodic_work, HZ);

Probably more sensible to use a temporary. Something like:

---
 drivers/staging/octeon/ethernet.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/octeon/ethernet.c +3 -3
index 9b15c9ed844b..2febf1229587 100644
@@ -137,12 +137,12 @@ static void cvm_oct_periodic_worker(struct work_struct *work)
 	struct octeon_ethernet *priv = container_of(work,
 						    struct octeon_ethernet,
 						    port_periodic_work.work);
+	struct net_device *ndev = cvm_oct_device[priv->port];
 
 	if (priv->poll)
-		priv->poll(cvm_oct_device[priv->port]);
+		priv->poll(ndev);
 
-	cvm_oct_device[priv->port]->netdev_ops->ndo_get_stats(
-						cvm_oct_device[priv->port]);
+	ndev->netdev_ops->ndo_get_stats(ndev);
 
 	if (!atomic_read(&cvm_oct_poll_queue_stopping))
 		schedule_delayed_work(&priv->port_periodic_work, HZ);
#2 lore raw

Thank you, i found a few case on this module i will try to fix them and send a new patch series.

Quoted 53 lines · Joe Perches
Quoted 13 lines · Georgios Tsotsos

Fixing coding style for a few lines that were reported to check from checkpatch.pl in minor cases for alignment and ending with parenthesis.

---
 drivers/staging/octeon/ethernet.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/staging/octeon/ethernet.c +0 -0
index 9b15c9ed844b..1e258deecacc 100644

drivers/staging/octeon/ethernet.c static void cvm_oct_periodic_worker(struct work_struct *work) · line 148

Quoted 10 lines
drivers/staging/octeon/ethernet.c +2 -2
@@ -141,8 +141,8 @@ static void cvm_oct_periodic_worker(struct work_struct *work)
      if (priv->poll)
              priv->poll(cvm_oct_device[priv->port]);
 
-     cvm_oct_device[priv->port]->netdev_ops->ndo_get_stats(
-                                             cvm_oct_device[priv->port]);
+     cvm_oct_device[priv->port]->netdev_ops
+                             ->ndo_get_stats(cvm_oct_device[priv->port]);
 
      if (!atomic_read(&cvm_oct_poll_queue_stopping))
              schedule_delayed_work(&priv->port_periodic_work, HZ);

Probably more sensible to use a temporary. Something like:

---
 drivers/staging/octeon/ethernet.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/octeon/ethernet.c +3 -3
index 9b15c9ed844b..2febf1229587 100644
@@ -137,12 +137,12 @@ static void cvm_oct_periodic_worker(struct work_struct *work)
        struct octeon_ethernet *priv = container_of(work,
                                                    struct octeon_ethernet,
                                                    port_periodic_work.work);
+       struct net_device *ndev = cvm_oct_device[priv->port];
 
        if (priv->poll)
-               priv->poll(cvm_oct_device[priv->port]);
+               priv->poll(ndev);
 
-       cvm_oct_device[priv->port]->netdev_ops->ndo_get_stats(
-                                               cvm_oct_device[priv->port]);
+       ndev->netdev_ops->ndo_get_stats(ndev);
 
        if (!atomic_read(&cvm_oct_poll_queue_stopping))
                schedule_delayed_work(&priv->port_periodic_work, HZ);
Signature · 10 lines
Best regards!
Georgios Tsotsos
Greece-Evia-Chalkida
[email protected]
skype: tsotsos
------------------------------------
Georgios Tsotsos
*Greece - Evia - Chalkida*
tsotsos[at]linux.com
skype: tsotsos