[PATCH 2/2] staging: vt6656: Remove useless function

[PATCH 2/2] staging: vt6656: Remove useless function

[Marcos Paulo de Souza]

This patch removes a useless function, because its just return a 0
value.

Signed-off-by: Marcos Paulo de Souza <marcos.mage@gmail.com>
---
 drivers/staging/vt6656/iwctl.c |   18 +-----------------
 1 files changed, 1 insertions(+), 17 deletions(-)

diff --git a/drivers/staging/vt6656/iwctl.c b/drivers/staging/vt6656/iwctl.c
index 2121205..9dc5757 100644
--- a/drivers/staging/vt6656/iwctl.c
+++ b/drivers/staging/vt6656/iwctl.c
@@ -100,21 +100,6 @@ struct iw_statistics *iwctl_get_wireless_stats(struct net_device *dev)
 	return &pDevice->wstats;
 }
 
-
-
-/*------------------------------------------------------------------*/
-
-
-static int iwctl_commit(struct net_device *dev,
-			      struct iw_request_info *info,
-			      void *wrq,
-			      char *extra)
-{
-    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWCOMMIT\n");
-
-	return 0;
-}
-
 /*
  * Wireless Handler : get protocol name
  */
@@ -1936,7 +1921,6 @@ int iwctl_siwmlme(struct net_device *dev,
 /*
 static const iw_handler		iwctl_handler[] =
 {
-	(iw_handler) iwctl_commit,      // SIOCSIWCOMMIT
 	(iw_handler) iwctl_giwname,     // SIOCGIWNAME
 	(iw_handler) NULL,				// SIOCSIWNWID
 	(iw_handler) NULL,				// SIOCGIWNWID
@@ -1998,7 +1982,7 @@ static const iw_handler		iwctl_handler[] =
 
 static const iw_handler		iwctl_handler[] =
 {
-	(iw_handler) iwctl_commit,      // SIOCSIWCOMMIT
+	(iw_handler) 0,      /* SIOCSIWCOMMIT */
 	(iw_handler) NULL,      // SIOCGIWNAME
 	(iw_handler) NULL,				// SIOCSIWNWID
 	(iw_handler) NULL,				// SIOCGIWNWID
-- 
1.7.4.4

Re: [PATCH 2/2] staging: vt6656: Remove useless function

[Dan Carpenter]

[-- Attachment #1: Type: text/plain, Size: 1157 bytes --]

On Tue, Dec 20, 2011 at 01:07:27AM +0000, Marcos Paulo de Souza wrote:
>  /*
>   * Wireless Handler : get protocol name
>   */
> @@ -1936,7 +1921,6 @@ int iwctl_siwmlme(struct net_device *dev,
>  /*
>  static const iw_handler		iwctl_handler[] =
>  {
> -	(iw_handler) iwctl_commit,      // SIOCSIWCOMMIT

Nope.  This doesn't work.  It moves everything in the array to the
wrong position.  It should be replaced with NULL or better yet, the
whole array should be rewritten with like:

static const iw_handler iwctl_handler[] = {
	[SIOCGIWNAME]  = (iw_handler) iwctl_giwname,
	[SIOCGIWRANGE] = (iw_handler) iwctl_giwrange,
	...

The NULLs could be left out then.

>  	(iw_handler) iwctl_giwname,     // SIOCGIWNAME
>  	(iw_handler) NULL,				// SIOCSIWNWID
>  	(iw_handler) NULL,				// SIOCGIWNWID
> @@ -1998,7 +1982,7 @@ static const iw_handler		iwctl_handler[] =
>  
>  static const iw_handler		iwctl_handler[] =
>  {
> -	(iw_handler) iwctl_commit,      // SIOCSIWCOMMIT
> +	(iw_handler) 0,      /* SIOCSIWCOMMIT */

This should be NULL not zero because it's a pointer.  (Style issue,
not a bug).

regards,
dan carpenter


[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]