svn commit: r233559 - stable/9/usr.sbin/moused

[Hans Petter Selasky]

Author: hselasky
Date: Tue Mar 27 15:27:36 2012
New Revision: 233559
URL: http://svn.freebsd.org/changeset/base/233559

Log:
  MFC r233090:
  The UMS module is now loaded by rules in /etc/devd/usb.conf which
  are executed by devd. Remove duplicate kldload.

Modified:
  stable/9/usr.sbin/moused/moused.c
Directory Properties:
  stable/9/usr.sbin/moused/   (props changed)

Modified: stable/9/usr.sbin/moused/moused.c
==============================================================================
--- stable/9/usr.sbin/moused/moused.c	Tue Mar 27 15:27:20 2012	(r233558)
+++ stable/9/usr.sbin/moused/moused.c	Tue Mar 27 15:27:36 2012	(r233559)
@@ -564,8 +564,6 @@ static void	mremote_clientchg(int add);
 static int	kidspad(u_char rxc, mousestatus_t *act);
 static int	gtco_digipad(u_char, mousestatus_t *);
 
-static int	usbmodule(void);
-
 int
 main(int argc, char *argv[])
 {
@@ -880,8 +878,7 @@ main(int argc, char *argv[])
 
     retry = 1;
     if (strncmp(rodent.portname, "/dev/ums", 8) == 0) {
-	if (usbmodule() != 0)
-	    retry = 5;
+	retry = 5;
     }
 
     for (;;) {
@@ -953,12 +950,6 @@ main(int argc, char *argv[])
     exit(0);
 }
 
-static int
-usbmodule(void)
-{
-    return (kld_isloaded("uhub/ums") || kld_load("ums") != -1);
-}
-
 /*
  * Function to calculate linear acceleration.
  *