All of lore.kernel.org
 help / color / mirror / Atom feed
* [KJ] linux-2.6.9: psmouse fix names
@ 2005-03-04  9:42 walter harms
  2005-03-04 13:08 ` Stephen Biggs
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: walter harms @ 2005-03-04  9:42 UTC (permalink / raw)
  To: kernel-janitors

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

Hi list,

the psmouse driver reports the name "psmouse.c" with error messages. 
Since there is a psmouse.o but no .c this is confusing. (at least to 
me). this patch changes the hardcoded names to __FUNCTION__.

btw: do anyone know how to restart the synaptics driver ? it stops 
working sometimes.

(because of tab/space problems this patch is also attached).

drivers/input/mouse/psmouse-base.c

replace wrong filenames in error messages

Signed-off-by: walter harms <wharms@bfs.de>

--- linux-2.6.9/drivers/input/mouse/psmouse-base.c.bak	2005-03-03 
22:18:49.000000000 +0100
+++ linux-2.6.9/drivers/input/mouse/psmouse-base.c	2005-03-03 
22:38:57.000000000 +0100
@@ -141,7 +141,7 @@

  	if (flags & (SERIO_PARITY|SERIO_TIMEOUT)) {
  		if (psmouse->state == PSMOUSE_ACTIVATED)
-			printk(KERN_WARNING "psmouse.c: bad data from KBC -%s%s\n",
+			printk(KERN_WARNING "%s: bad data from KBC -%s%s\n",__FUNCTION__,
  				flags & SERIO_TIMEOUT ? " timeout" : "",
  				flags & SERIO_PARITY ? " bad parity" : "");
  		psmouse->nak = 1;
@@ -207,7 +207,7 @@

  	if (psmouse->state == PSMOUSE_ACTIVATED &&
  	    psmouse->pktcnt && time_after(jiffies, psmouse->last + HZ/2)) {
-		printk(KERN_WARNING "psmouse.c: %s at %s lost synchronization, 
throwing %d bytes away.\n",
+		printk(KERN_WARNING "%s: %s at %s lost synchronization, throwing %d 
bytes away.\n",__FUNCTION__,
  		       psmouse->name, psmouse->phys, psmouse->pktcnt);
  		psmouse->pktcnt = 0;
  	}
@@ -239,13 +239,13 @@

  	switch (rc) {
  		case PSMOUSE_BAD_DATA:
-			printk(KERN_WARNING "psmouse.c: %s at %s lost sync at byte %d\n",
+			printk(KERN_WARNING "%s: %s at %s lost sync at byte %d\n",__FUNCTION__,
  				psmouse->name, psmouse->phys, psmouse->pktcnt);
  			psmouse->pktcnt = 0;

  			if (++psmouse->out_of_sync == psmouse_resetafter) {
  				psmouse->state = PSMOUSE_IGNORE;
-				printk(KERN_NOTICE "psmouse.c: issuing reconnect request\n");
+				printk(KERN_NOTICE "%s: issuing reconnect request\n",__FUNCTION__);
  				serio_reconnect(psmouse->serio);
  			}
  			break;
@@ -254,7 +254,7 @@
  			psmouse->pktcnt = 0;
  			if (psmouse->out_of_sync) {
  				psmouse->out_of_sync = 0;
-				printk(KERN_NOTICE "psmouse.c: %s at %s - driver resynched.\n",
+				printk(KERN_NOTICE "%s: %s at %s - driver resynched.\n",__FUNCTION__,
  					psmouse->name, psmouse->phys);
  			}
  			break;
@@ -581,7 +581,7 @@
   */

  	if (psmouse_command(psmouse, NULL, PSMOUSE_CMD_RESET_DIS))
-		printk(KERN_WARNING "psmouse.c: Failed to reset mouse on %s\n", 
psmouse->serio->phys);
+		printk(KERN_WARNING "%s: Failed to reset mouse on %s\n",__FUNCTION__, 
psmouse->serio->phys);

  	return 0;
  }
@@ -671,7 +671,7 @@
  static void psmouse_activate(struct psmouse *psmouse)
  {
  	if (psmouse_command(psmouse, NULL, PSMOUSE_CMD_ENABLE))
-		printk(KERN_WARNING "psmouse.c: Failed to enable mouse on %s\n", 
psmouse->serio->phys);
+		printk(KERN_WARNING "%s: Failed to enable mouse on 
%s\n",__FUNCTION__, psmouse->serio->phys);

  	psmouse_set_state(psmouse, PSMOUSE_ACTIVATED);
  }
@@ -685,7 +685,7 @@
  static void psmouse_deactivate(struct psmouse *psmouse)
  {
  	if (psmouse_command(psmouse, NULL, PSMOUSE_CMD_DISABLE))
-		printk(KERN_WARNING "psmouse.c: Failed to deactivate mouse on %s\n", 
psmouse->serio->phys);
+		printk(KERN_WARNING "%s: Failed to deactivate mouse on 
%s\n",__FUNCTION__, psmouse->serio->phys);

  	psmouse_set_state(psmouse, PSMOUSE_CMD_MODE);
  }
@@ -814,7 +814,8 @@
  		 * Nothing to be done here, serio core will detect that
  		 * the driver set serio->child and will register it for us.
  		 */
-		printk(KERN_INFO "serio: %s port at %s\n", serio->child->name, 
psmouse->phys);
+		printk(KERN_INFO "%s: serio: %s port at %s\n",__FUNCTION__, 
serio->child->name, psmouse->phys);
+
  	}

  	psmouse_activate(psmouse);
@@ -834,7 +835,7 @@
  	int rc = -1;

  	if (!drv || !psmouse) {
-		printk(KERN_DEBUG "psmouse: reconnect request, but serio is 
disconnected, ignoring...\n");
+		printk(KERN_DEBUG "%s: reconnect request, but serio is disconnected, 
ignoring...\n",__FUNCTION__);
  		return -1;
  	}

@@ -896,7 +897,7 @@
  		else if (!strcmp(psmouse_proto, "exps"))
  			psmouse_max_proto = PSMOUSE_IMEX;
  		else
-			printk(KERN_ERR "psmouse: unknown protocol type '%s'\n", psmouse_proto);
+			printk(KERN_ERR "%s: unknown protocol type '%s'\n", __FUNCTION__, 
psmouse_proto);
  	}
  }


[-- Attachment #2: psmouse.diff --]
[-- Type: text/plain, Size: 3829 bytes --]

--- linux-2.6.9/drivers/input/mouse/psmouse-base.c.bak	2005-03-03 22:18:49.000000000 +0100
+++ linux-2.6.9/drivers/input/mouse/psmouse-base.c	2005-03-03 22:38:57.000000000 +0100
@@ -141,7 +141,7 @@
 
 	if (flags & (SERIO_PARITY|SERIO_TIMEOUT)) {
 		if (psmouse->state == PSMOUSE_ACTIVATED)
-			printk(KERN_WARNING "psmouse.c: bad data from KBC -%s%s\n",
+			printk(KERN_WARNING "%s: bad data from KBC -%s%s\n",__FUNCTION__,
 				flags & SERIO_TIMEOUT ? " timeout" : "",
 				flags & SERIO_PARITY ? " bad parity" : "");
 		psmouse->nak = 1;
@@ -207,7 +207,7 @@
 
 	if (psmouse->state == PSMOUSE_ACTIVATED &&
 	    psmouse->pktcnt && time_after(jiffies, psmouse->last + HZ/2)) {
-		printk(KERN_WARNING "psmouse.c: %s at %s lost synchronization, throwing %d bytes away.\n",
+		printk(KERN_WARNING "%s: %s at %s lost synchronization, throwing %d bytes away.\n",__FUNCTION__,
 		       psmouse->name, psmouse->phys, psmouse->pktcnt);
 		psmouse->pktcnt = 0;
 	}
@@ -239,13 +239,13 @@
 
 	switch (rc) {
 		case PSMOUSE_BAD_DATA:
-			printk(KERN_WARNING "psmouse.c: %s at %s lost sync at byte %d\n",
+			printk(KERN_WARNING "%s: %s at %s lost sync at byte %d\n",__FUNCTION__,
 				psmouse->name, psmouse->phys, psmouse->pktcnt);
 			psmouse->pktcnt = 0;
 
 			if (++psmouse->out_of_sync == psmouse_resetafter) {
 				psmouse->state = PSMOUSE_IGNORE;
-				printk(KERN_NOTICE "psmouse.c: issuing reconnect request\n");
+				printk(KERN_NOTICE "%s: issuing reconnect request\n",__FUNCTION__);
 				serio_reconnect(psmouse->serio);
 			}
 			break;
@@ -254,7 +254,7 @@
 			psmouse->pktcnt = 0;
 			if (psmouse->out_of_sync) {
 				psmouse->out_of_sync = 0;
-				printk(KERN_NOTICE "psmouse.c: %s at %s - driver resynched.\n",
+				printk(KERN_NOTICE "%s: %s at %s - driver resynched.\n",__FUNCTION__,
 					psmouse->name, psmouse->phys);
 			}
 			break;
@@ -581,7 +581,7 @@
  */
 
 	if (psmouse_command(psmouse, NULL, PSMOUSE_CMD_RESET_DIS))
-		printk(KERN_WARNING "psmouse.c: Failed to reset mouse on %s\n", psmouse->serio->phys);
+		printk(KERN_WARNING "%s: Failed to reset mouse on %s\n",__FUNCTION__, psmouse->serio->phys);
 
 	return 0;
 }
@@ -671,7 +671,7 @@
 static void psmouse_activate(struct psmouse *psmouse)
 {
 	if (psmouse_command(psmouse, NULL, PSMOUSE_CMD_ENABLE))
-		printk(KERN_WARNING "psmouse.c: Failed to enable mouse on %s\n", psmouse->serio->phys);
+		printk(KERN_WARNING "%s: Failed to enable mouse on %s\n",__FUNCTION__, psmouse->serio->phys);
 
 	psmouse_set_state(psmouse, PSMOUSE_ACTIVATED);
 }
@@ -685,7 +685,7 @@
 static void psmouse_deactivate(struct psmouse *psmouse)
 {
 	if (psmouse_command(psmouse, NULL, PSMOUSE_CMD_DISABLE))
-		printk(KERN_WARNING "psmouse.c: Failed to deactivate mouse on %s\n", psmouse->serio->phys);
+		printk(KERN_WARNING "%s: Failed to deactivate mouse on %s\n",__FUNCTION__, psmouse->serio->phys);
 
 	psmouse_set_state(psmouse, PSMOUSE_CMD_MODE);
 }
@@ -814,7 +814,8 @@
 		 * Nothing to be done here, serio core will detect that
 		 * the driver set serio->child and will register it for us.
 		 */
-		printk(KERN_INFO "serio: %s port at %s\n", serio->child->name, psmouse->phys);
+		printk(KERN_INFO "%s: serio: %s port at %s\n",__FUNCTION__, serio->child->name, psmouse->phys);
+
 	}
 
 	psmouse_activate(psmouse);
@@ -834,7 +835,7 @@
 	int rc = -1;
 
 	if (!drv || !psmouse) {
-		printk(KERN_DEBUG "psmouse: reconnect request, but serio is disconnected, ignoring...\n");
+		printk(KERN_DEBUG "%s: reconnect request, but serio is disconnected, ignoring...\n",__FUNCTION__);
 		return -1;
 	}
 
@@ -896,7 +897,7 @@
 		else if (!strcmp(psmouse_proto, "exps"))
 			psmouse_max_proto = PSMOUSE_IMEX;
 		else
-			printk(KERN_ERR "psmouse: unknown protocol type '%s'\n", psmouse_proto);
+			printk(KERN_ERR "%s: unknown protocol type '%s'\n", __FUNCTION__, psmouse_proto);
 	}
 }
 

[-- Attachment #3: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [KJ] linux-2.6.9: psmouse fix names
  2005-03-04  9:42 [KJ] linux-2.6.9: psmouse fix names walter harms
@ 2005-03-04 13:08 ` Stephen Biggs
  2005-03-04 15:47 ` Randy.Dunlap
  2005-03-04 16:58 ` Greg KH
  2 siblings, 0 replies; 4+ messages in thread
From: Stephen Biggs @ 2005-03-04 13:08 UTC (permalink / raw)
  To: kernel-janitors

[-- Attachment #1: Mail message body --]
[-- Type: text/plain, Size: 4865 bytes --]

Shouldn't you do something more along the lines of:

printk("%s/%s: This is a warning from a driver\n",
    __FILE__,__FUNCTION__);

... or is this out of standard with patches?

On 4 Mar 2005 at 10:42, walter harms wrote:

> Hi list,
> 
> the psmouse driver reports the name "psmouse.c" with error messages. 
> Since there is a psmouse.o but no .c this is confusing. (at least to 
> me). this patch changes the hardcoded names to __FUNCTION__.
> 
> btw: do anyone know how to restart the synaptics driver ? it stops 
> working sometimes.
> 
> (because of tab/space problems this patch is also attached).
> 
> drivers/input/mouse/psmouse-base.c
> 
> replace wrong filenames in error messages
> 
> Signed-off-by: walter harms <wharms@bfs.de>
> 
> --- linux-2.6.9/drivers/input/mouse/psmouse-base.c.bak	2005-03-03 
> 22:18:49.000000000 +0100
> +++ linux-2.6.9/drivers/input/mouse/psmouse-base.c	2005-03-03 
> 22:38:57.000000000 +0100
> @@ -141,7 +141,7 @@
> 
>   	if (flags & (SERIO_PARITY|SERIO_TIMEOUT)) {
>   		if (psmouse->state == PSMOUSE_ACTIVATED)
> -			printk(KERN_WARNING "psmouse.c: bad data from KBC -%s%s\n",
> +			printk(KERN_WARNING "%s: bad data from KBC -%s%s\n",__FUNCTION__,
>   				flags & SERIO_TIMEOUT ? " timeout" : "",
>   				flags & SERIO_PARITY ? " bad parity" : "");
>   		psmouse->nak = 1;
> @@ -207,7 +207,7 @@
> 
>   	if (psmouse->state == PSMOUSE_ACTIVATED &&
>   	    psmouse->pktcnt && time_after(jiffies, psmouse->last + HZ/2)) {
> -		printk(KERN_WARNING "psmouse.c: %s at %s lost synchronization, 
> throwing %d bytes away.\n",
> +		printk(KERN_WARNING "%s: %s at %s lost synchronization, throwing %d 
> bytes away.\n",__FUNCTION__,
>   		       psmouse->name, psmouse->phys, psmouse->pktcnt);
>   		psmouse->pktcnt = 0;
>   	}
> @@ -239,13 +239,13 @@
> 
>   	switch (rc) {
>   		case PSMOUSE_BAD_DATA:
> -			printk(KERN_WARNING "psmouse.c: %s at %s lost sync at byte %d\n",
> +			printk(KERN_WARNING "%s: %s at %s lost sync at byte %d\n",__FUNCTION__,
>   				psmouse->name, psmouse->phys, psmouse->pktcnt);
>   			psmouse->pktcnt = 0;
> 
>   			if (++psmouse->out_of_sync == psmouse_resetafter) {
>   				psmouse->state = PSMOUSE_IGNORE;
> -				printk(KERN_NOTICE "psmouse.c: issuing reconnect request\n");
> +				printk(KERN_NOTICE "%s: issuing reconnect request\n",__FUNCTION__);
>   				serio_reconnect(psmouse->serio);
>   			}
>   			break;
> @@ -254,7 +254,7 @@
>   			psmouse->pktcnt = 0;
>   			if (psmouse->out_of_sync) {
>   				psmouse->out_of_sync = 0;
> -				printk(KERN_NOTICE "psmouse.c: %s at %s - driver resynched.\n",
> +				printk(KERN_NOTICE "%s: %s at %s - driver resynched.\n",__FUNCTION__,
>   					psmouse->name, psmouse->phys);
>   			}
>   			break;
> @@ -581,7 +581,7 @@
>    */
> 
>   	if (psmouse_command(psmouse, NULL, PSMOUSE_CMD_RESET_DIS))
> -		printk(KERN_WARNING "psmouse.c: Failed to reset mouse on %s\n", 
> psmouse->serio->phys);
> +		printk(KERN_WARNING "%s: Failed to reset mouse on %s\n",__FUNCTION__, 
> psmouse->serio->phys);
> 
>   	return 0;
>   }
> @@ -671,7 +671,7 @@
>   static void psmouse_activate(struct psmouse *psmouse)
>   {
>   	if (psmouse_command(psmouse, NULL, PSMOUSE_CMD_ENABLE))
> -		printk(KERN_WARNING "psmouse.c: Failed to enable mouse on %s\n", 
> psmouse->serio->phys);
> +		printk(KERN_WARNING "%s: Failed to enable mouse on 
> %s\n",__FUNCTION__, psmouse->serio->phys);
> 
>   	psmouse_set_state(psmouse, PSMOUSE_ACTIVATED);
>   }
> @@ -685,7 +685,7 @@
>   static void psmouse_deactivate(struct psmouse *psmouse)
>   {
>   	if (psmouse_command(psmouse, NULL, PSMOUSE_CMD_DISABLE))
> -		printk(KERN_WARNING "psmouse.c: Failed to deactivate mouse on %s\n", 
> psmouse->serio->phys);
> +		printk(KERN_WARNING "%s: Failed to deactivate mouse on 
> %s\n",__FUNCTION__, psmouse->serio->phys);
> 
>   	psmouse_set_state(psmouse, PSMOUSE_CMD_MODE);
>   }
> @@ -814,7 +814,8 @@
>   		 * Nothing to be done here, serio core will detect that
>   		 * the driver set serio->child and will register it for us.
>   		 */
> -		printk(KERN_INFO "serio: %s port at %s\n", serio->child->name, 
> psmouse->phys);
> +		printk(KERN_INFO "%s: serio: %s port at %s\n",__FUNCTION__, 
> serio->child->name, psmouse->phys);
> +
>   	}
> 
>   	psmouse_activate(psmouse);
> @@ -834,7 +835,7 @@
>   	int rc = -1;
> 
>   	if (!drv || !psmouse) {
> -		printk(KERN_DEBUG "psmouse: reconnect request, but serio is 
> disconnected, ignoring...\n");
> +		printk(KERN_DEBUG "%s: reconnect request, but serio is disconnected, 
> ignoring...\n",__FUNCTION__);
>   		return -1;
>   	}
> 
> @@ -896,7 +897,7 @@
>   		else if (!strcmp(psmouse_proto, "exps"))
>   			psmouse_max_proto = PSMOUSE_IMEX;
>   		else
> -			printk(KERN_ERR "psmouse: unknown protocol type '%s'\n", psmouse_proto);
> +			printk(KERN_ERR "%s: unknown protocol type '%s'\n", __FUNCTION__, 
> psmouse_proto);
>   	}
>   }
> 
> 




[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [KJ] linux-2.6.9: psmouse fix names
  2005-03-04  9:42 [KJ] linux-2.6.9: psmouse fix names walter harms
  2005-03-04 13:08 ` Stephen Biggs
@ 2005-03-04 15:47 ` Randy.Dunlap
  2005-03-04 16:58 ` Greg KH
  2 siblings, 0 replies; 4+ messages in thread
From: Randy.Dunlap @ 2005-03-04 15:47 UTC (permalink / raw)
  To: kernel-janitors

walter harms wrote:
> Hi list,
> 
> the psmouse driver reports the name "psmouse.c" with error messages. 
> Since there is a psmouse.o but no .c this is confusing. (at least to 
> me). this patch changes the hardcoded names to __FUNCTION__.

Patch does not apply cleanly to 2.6.11.

It would make sense to me to report which module is producing these
warning messages, and since psmouse.c is not correct, maybe do what
some other drivers do and

#define PREFIX		"psmouse:"
or
#define MODNAME		"psmouse"

and use that it all messages.

> btw: do anyone know how to restart the synaptics driver ? it stops 
> working sometimes.
> 
> (because of tab/space problems this patch is also attached).
> 
> drivers/input/mouse/psmouse-base.c
> 
> replace wrong filenames in error messages
> 
> Signed-off-by: walter harms <wharms@bfs.de>
> 
> --- linux-2.6.9/drivers/input/mouse/psmouse-base.c.bak    2005-03-03 
> 22:18:49.000000000 +0100
> +++ linux-2.6.9/drivers/input/mouse/psmouse-base.c    2005-03-03 
> 22:38:57.000000000 +0100
> @@ -141,7 +141,7 @@
> 
>      if (flags & (SERIO_PARITY|SERIO_TIMEOUT)) {
>          if (psmouse->state = PSMOUSE_ACTIVATED)
> -            printk(KERN_WARNING "psmouse.c: bad data from KBC -%s%s\n",
> +            printk(KERN_WARNING "%s: bad data from KBC 
> -%s%s\n",__FUNCTION__,
>                  flags & SERIO_TIMEOUT ? " timeout" : "",
>                  flags & SERIO_PARITY ? " bad parity" : "");
>          psmouse->nak = 1;
> @@ -207,7 +207,7 @@
> 
>      if (psmouse->state = PSMOUSE_ACTIVATED &&
>          psmouse->pktcnt && time_after(jiffies, psmouse->last + HZ/2)) {
> -        printk(KERN_WARNING "psmouse.c: %s at %s lost synchronization, 
> throwing %d bytes away.\n",
> +        printk(KERN_WARNING "%s: %s at %s lost synchronization, 
> throwing %d bytes away.\n",__FUNCTION__,
>                 psmouse->name, psmouse->phys, psmouse->pktcnt);
>          psmouse->pktcnt = 0;
>      }
> @@ -239,13 +239,13 @@
> 
>      switch (rc) {
>          case PSMOUSE_BAD_DATA:
> -            printk(KERN_WARNING "psmouse.c: %s at %s lost sync at byte 
> %d\n",
> +            printk(KERN_WARNING "%s: %s at %s lost sync at byte 
> %d\n",__FUNCTION__,
>                  psmouse->name, psmouse->phys, psmouse->pktcnt);
>              psmouse->pktcnt = 0;
> 
>              if (++psmouse->out_of_sync = psmouse_resetafter) {
>                  psmouse->state = PSMOUSE_IGNORE;
> -                printk(KERN_NOTICE "psmouse.c: issuing reconnect 
> request\n");
> +                printk(KERN_NOTICE "%s: issuing reconnect 
> request\n",__FUNCTION__);
>                  serio_reconnect(psmouse->serio);
>              }
>              break;
> @@ -254,7 +254,7 @@
>              psmouse->pktcnt = 0;
>              if (psmouse->out_of_sync) {
>                  psmouse->out_of_sync = 0;
> -                printk(KERN_NOTICE "psmouse.c: %s at %s - driver 
> resynched.\n",
> +                printk(KERN_NOTICE "%s: %s at %s - driver 
> resynched.\n",__FUNCTION__,
>                      psmouse->name, psmouse->phys);
>              }
>              break;
> @@ -581,7 +581,7 @@
>   */
> 
>      if (psmouse_command(psmouse, NULL, PSMOUSE_CMD_RESET_DIS))
> -        printk(KERN_WARNING "psmouse.c: Failed to reset mouse on %s\n", 
> psmouse->serio->phys);
> +        printk(KERN_WARNING "%s: Failed to reset mouse on 
> %s\n",__FUNCTION__, psmouse->serio->phys);
> 
>      return 0;
>  }
> @@ -671,7 +671,7 @@
>  static void psmouse_activate(struct psmouse *psmouse)
>  {
>      if (psmouse_command(psmouse, NULL, PSMOUSE_CMD_ENABLE))
> -        printk(KERN_WARNING "psmouse.c: Failed to enable mouse on 
> %s\n", psmouse->serio->phys);
> +        printk(KERN_WARNING "%s: Failed to enable mouse on 
> %s\n",__FUNCTION__, psmouse->serio->phys);
> 
>      psmouse_set_state(psmouse, PSMOUSE_ACTIVATED);
>  }
> @@ -685,7 +685,7 @@
>  static void psmouse_deactivate(struct psmouse *psmouse)
>  {
>      if (psmouse_command(psmouse, NULL, PSMOUSE_CMD_DISABLE))
> -        printk(KERN_WARNING "psmouse.c: Failed to deactivate mouse on 
> %s\n", psmouse->serio->phys);
> +        printk(KERN_WARNING "%s: Failed to deactivate mouse on 
> %s\n",__FUNCTION__, psmouse->serio->phys);
> 
>      psmouse_set_state(psmouse, PSMOUSE_CMD_MODE);
>  }
> @@ -814,7 +814,8 @@
>           * Nothing to be done here, serio core will detect that
>           * the driver set serio->child and will register it for us.
>           */
> -        printk(KERN_INFO "serio: %s port at %s\n", serio->child->name, 
> psmouse->phys);
> +        printk(KERN_INFO "%s: serio: %s port at %s\n",__FUNCTION__, 
> serio->child->name, psmouse->phys);
> +
>      }
> 
>      psmouse_activate(psmouse);
> @@ -834,7 +835,7 @@
>      int rc = -1;
> 
>      if (!drv || !psmouse) {
> -        printk(KERN_DEBUG "psmouse: reconnect request, but serio is 
> disconnected, ignoring...\n");
> +        printk(KERN_DEBUG "%s: reconnect request, but serio is 
> disconnected, ignoring...\n",__FUNCTION__);
>          return -1;
>      }
> 
> @@ -896,7 +897,7 @@
>          else if (!strcmp(psmouse_proto, "exps"))
>              psmouse_max_proto = PSMOUSE_IMEX;
>          else
> -            printk(KERN_ERR "psmouse: unknown protocol type '%s'\n", 
> psmouse_proto);
> +            printk(KERN_ERR "%s: unknown protocol type '%s'\n", 
> __FUNCTION__, psmouse_proto);
>      }
>  }
> 
> 
> ------------------------------------------------------------------------
> 
> --- linux-2.6.9/drivers/input/mouse/psmouse-base.c.bak	2005-03-03 22:18:49.000000000 +0100
> +++ linux-2.6.9/drivers/input/mouse/psmouse-base.c	2005-03-03 22:38:57.000000000 +0100
> @@ -141,7 +141,7 @@
>  
>  	if (flags & (SERIO_PARITY|SERIO_TIMEOUT)) {
>  		if (psmouse->state = PSMOUSE_ACTIVATED)
> -			printk(KERN_WARNING "psmouse.c: bad data from KBC -%s%s\n",
> +			printk(KERN_WARNING "%s: bad data from KBC -%s%s\n",__FUNCTION__,
>  				flags & SERIO_TIMEOUT ? " timeout" : "",
>  				flags & SERIO_PARITY ? " bad parity" : "");
>  		psmouse->nak = 1;
> @@ -207,7 +207,7 @@
>  
>  	if (psmouse->state = PSMOUSE_ACTIVATED &&
>  	    psmouse->pktcnt && time_after(jiffies, psmouse->last + HZ/2)) {
> -		printk(KERN_WARNING "psmouse.c: %s at %s lost synchronization, throwing %d bytes away.\n",
> +		printk(KERN_WARNING "%s: %s at %s lost synchronization, throwing %d bytes away.\n",__FUNCTION__,
>  		       psmouse->name, psmouse->phys, psmouse->pktcnt);
>  		psmouse->pktcnt = 0;
>  	}
> @@ -239,13 +239,13 @@
>  
>  	switch (rc) {
>  		case PSMOUSE_BAD_DATA:
> -			printk(KERN_WARNING "psmouse.c: %s at %s lost sync at byte %d\n",
> +			printk(KERN_WARNING "%s: %s at %s lost sync at byte %d\n",__FUNCTION__,
>  				psmouse->name, psmouse->phys, psmouse->pktcnt);
>  			psmouse->pktcnt = 0;
>  
>  			if (++psmouse->out_of_sync = psmouse_resetafter) {
>  				psmouse->state = PSMOUSE_IGNORE;
> -				printk(KERN_NOTICE "psmouse.c: issuing reconnect request\n");
> +				printk(KERN_NOTICE "%s: issuing reconnect request\n",__FUNCTION__);
>  				serio_reconnect(psmouse->serio);
>  			}
>  			break;
> @@ -254,7 +254,7 @@
>  			psmouse->pktcnt = 0;
>  			if (psmouse->out_of_sync) {
>  				psmouse->out_of_sync = 0;
> -				printk(KERN_NOTICE "psmouse.c: %s at %s - driver resynched.\n",
> +				printk(KERN_NOTICE "%s: %s at %s - driver resynched.\n",__FUNCTION__,
>  					psmouse->name, psmouse->phys);
>  			}
>  			break;
> @@ -581,7 +581,7 @@
>   */
>  
>  	if (psmouse_command(psmouse, NULL, PSMOUSE_CMD_RESET_DIS))
> -		printk(KERN_WARNING "psmouse.c: Failed to reset mouse on %s\n", psmouse->serio->phys);
> +		printk(KERN_WARNING "%s: Failed to reset mouse on %s\n",__FUNCTION__, psmouse->serio->phys);
>  
>  	return 0;
>  }
> @@ -671,7 +671,7 @@
>  static void psmouse_activate(struct psmouse *psmouse)
>  {
>  	if (psmouse_command(psmouse, NULL, PSMOUSE_CMD_ENABLE))
> -		printk(KERN_WARNING "psmouse.c: Failed to enable mouse on %s\n", psmouse->serio->phys);
> +		printk(KERN_WARNING "%s: Failed to enable mouse on %s\n",__FUNCTION__, psmouse->serio->phys);
>  
>  	psmouse_set_state(psmouse, PSMOUSE_ACTIVATED);
>  }
> @@ -685,7 +685,7 @@
>  static void psmouse_deactivate(struct psmouse *psmouse)
>  {
>  	if (psmouse_command(psmouse, NULL, PSMOUSE_CMD_DISABLE))
> -		printk(KERN_WARNING "psmouse.c: Failed to deactivate mouse on %s\n", psmouse->serio->phys);
> +		printk(KERN_WARNING "%s: Failed to deactivate mouse on %s\n",__FUNCTION__, psmouse->serio->phys);
>  
>  	psmouse_set_state(psmouse, PSMOUSE_CMD_MODE);
>  }
> @@ -814,7 +814,8 @@
>  		 * Nothing to be done here, serio core will detect that
>  		 * the driver set serio->child and will register it for us.
>  		 */
> -		printk(KERN_INFO "serio: %s port at %s\n", serio->child->name, psmouse->phys);
> +		printk(KERN_INFO "%s: serio: %s port at %s\n",__FUNCTION__, serio->child->name, psmouse->phys);
> +
>  	}
>  
>  	psmouse_activate(psmouse);
> @@ -834,7 +835,7 @@
>  	int rc = -1;
>  
>  	if (!drv || !psmouse) {
> -		printk(KERN_DEBUG "psmouse: reconnect request, but serio is disconnected, ignoring...\n");
> +		printk(KERN_DEBUG "%s: reconnect request, but serio is disconnected, ignoring...\n",__FUNCTION__);
>  		return -1;
>  	}
>  
> @@ -896,7 +897,7 @@
>  		else if (!strcmp(psmouse_proto, "exps"))
>  			psmouse_max_proto = PSMOUSE_IMEX;
>  		else
> -			printk(KERN_ERR "psmouse: unknown protocol type '%s'\n", psmouse_proto);
> +			printk(KERN_ERR "%s: unknown protocol type '%s'\n", __FUNCTION__, psmouse_proto);


-- 
~Randy
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [KJ] linux-2.6.9: psmouse fix names
  2005-03-04  9:42 [KJ] linux-2.6.9: psmouse fix names walter harms
  2005-03-04 13:08 ` Stephen Biggs
  2005-03-04 15:47 ` Randy.Dunlap
@ 2005-03-04 16:58 ` Greg KH
  2 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2005-03-04 16:58 UTC (permalink / raw)
  To: kernel-janitors

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

On Fri, Mar 04, 2005 at 10:42:01AM +0100, walter harms wrote:
> Hi list,
> 
> the psmouse driver reports the name "psmouse.c" with error messages. 
> Since there is a psmouse.o but no .c this is confusing. (at least to 
> me). this patch changes the hardcoded names to __FUNCTION__.
> 
> btw: do anyone know how to restart the synaptics driver ? it stops 
> working sometimes.
> 
> (because of tab/space problems this patch is also attached).
> 
> drivers/input/mouse/psmouse-base.c
> 
> replace wrong filenames in error messages
> 
> Signed-off-by: walter harms <wharms@bfs.de>
> 
> --- linux-2.6.9/drivers/input/mouse/psmouse-base.c.bak	2005-03-03 
> 22:18:49.000000000 +0100
> +++ linux-2.6.9/drivers/input/mouse/psmouse-base.c	2005-03-03 
> 22:38:57.000000000 +0100
> @@ -141,7 +141,7 @@
> 
>  	if (flags & (SERIO_PARITY|SERIO_TIMEOUT)) {
>  		if (psmouse->state == PSMOUSE_ACTIVATED)
> -			printk(KERN_WARNING "psmouse.c: bad data from KBC 
> -%s%s\n",
> +			printk(KERN_WARNING "%s: bad data from KBC 
> -%s%s\n",__FUNCTION__,

Please use the dev_warn() and friend functions instead.  It gives you a
much better, and standardized, solution.

thanks,

greg k-h

[-- Attachment #2: Type: text/plain, Size: 167 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2005-03-04 16:58 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-03-04  9:42 [KJ] linux-2.6.9: psmouse fix names walter harms
2005-03-04 13:08 ` Stephen Biggs
2005-03-04 15:47 ` Randy.Dunlap
2005-03-04 16:58 ` Greg KH

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.