Fri Apr 24 03:35:49 2015 UTC ()

With new (corrected) configuration declarations file, the cdevsw is
already included by config.  So, for built-in sysmon module we don't
need to add the cdevsw to the table.


(pgoyette)

diff -r1.20 -r1.21 src/sys/dev/sysmon/sysmon.c

--- src/sys/dev/sysmon/sysmon.c 2015/04/23 23:22:03	1.20
+++ src/sys/dev/sysmon/sysmon.c 2015/04/24 03:35:49	1.21

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sysmon.c,v 1.20 2015/04/23 23:22:03 pgoyette Exp $	*/
+/*	$NetBSD: sysmon.c,v 1.21 2015/04/24 03:35:49 pgoyette Exp $	*/
 /*-
  * Copyright (c) 2000 Zembu Labs, Inc.
  * All rights reserved.
+ *
  * Author: Jason R. Thorpe <thorpej@zembu.com>
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -29,27 +29,27 @@
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Clearing house for system monitoring hardware.  We currently
  * handle environmental sensors, watchdog timers, and power management.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon.c,v 1.20 2015/04/23 23:22:03 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon.c,v 1.21 2015/04/24 03:35:49 pgoyette Exp $");
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/errno.h>
 #include <sys/fcntl.h>
 #include <sys/callout.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/module.h>
 #include <sys/mutex.h>
 #include <sys/device.h>
 @@ -335,58 +335,62 @@ sysmonkqfilter(dev_t dev, struct knote *
 		break;
 	default:
 		error = 1;
+	}
 	return (error);
+}
 MODULE(MODULE_CLASS_DRIVER, sysmon, "");
 int
 sysmon_init(void)
+{
 #ifdef _MODULE
 	devmajor_t bmajor, cmajor;
 #endif
 	static struct cfdata cf;
 	int error = 0;
 	if (sysmon_dev != NULL) {
 		return EEXIST;
+	}
 	error = config_cfdriver_attach(&sysmon_cd);
 	if (error) {
 		aprint_error("%s: unable to attach cfdriver\n",
 		    sysmon_cd.cd_name);
 		return error;
+	}
 	error = config_cfattach_attach(sysmon_cd.cd_name, &sysmon_ca);
 	if (error) {
 		config_cfdriver_detach(&sysmon_cd);
 		aprint_error("%s: unable to attach cfattach\n",
 		    sysmon_cd.cd_name);
 		return error;
+	}
 #ifdef _MODULE
 	bmajor = cmajor = -1;
 	error = devsw_attach("sysmon", NULL, &bmajor,
 			&sysmon_cdevsw, &cmajor);
 	if (error) {
 		config_cfattach_detach(sysmon_cd.cd_name, &sysmon_ca);
 		config_cfdriver_detach(&sysmon_cd);
 		aprint_error("%s: unable to attach devsw\n",
 		    sysmon_cd.cd_name);
 		return error;
+	}
 #endif
 	cf.cf_name = sysmon_cd.cd_name;
 	cf.cf_atname = sysmon_cd.cd_name;
 	cf.cf_unit = 0;
 	cf.cf_fstate = FSTATE_STAR;
 	cf.cf_pspec = NULL;
 	cf.cf_loc = NULL;
 	cf.cf_flags = 0;
 	sysmon_dev = config_attach_pseudo(&cf);
 	if (sysmon_dev == NULL) {
 		aprint_error("%s: failed to attach pseudo device\n",
 		    sysmon_cd.cd_name);