Module Name: src
Committed By: riastradh
Date: Wed Aug 24 11:18:56 UTC 2022
Modified Files:
src/sys/kern: kern_pmf.c subr_autoconf.c
src/sys/sys: device.h
Log Message:
kern: device_pmf_driver_register never fails, so make it return void.
No ABI bump despite change to device.h because this is used only
inside autoconf.
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/kern/kern_pmf.c
cvs rdiff -u -r1.302 -r1.303 src/sys/kern/subr_autoconf.c
cvs rdiff -u -r1.182 -r1.183 src/sys/sys/device.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_pmf.c
diff -u src/sys/kern/kern_pmf.c:1.48 src/sys/kern/kern_pmf.c:1.49
--- src/sys/kern/kern_pmf.c:1.48 Mon Mar 28 12:38:59 2022
+++ src/sys/kern/kern_pmf.c Wed Aug 24 11:18:56 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_pmf.c,v 1.48 2022/03/28 12:38:59 riastradh Exp $ */
+/* $NetBSD: kern_pmf.c,v 1.49 2022/08/24 11:18:56 riastradh Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_pmf.c,v 1.48 2022/03/28 12:38:59 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_pmf.c,v 1.49 2022/08/24 11:18:56 riastradh Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -417,9 +417,8 @@ pmf_device_register1(device_t dev,
bool (*resume)(device_t, const pmf_qual_t *),
bool (*shutdown)(device_t, int))
{
- if (!device_pmf_driver_register(dev, suspend, resume, shutdown))
- return false;
+ device_pmf_driver_register(dev, suspend, resume, shutdown);
if (!device_pmf_driver_child_register(dev)) {
device_pmf_driver_deregister(dev);
return false;
Index: src/sys/kern/subr_autoconf.c
diff -u src/sys/kern/subr_autoconf.c:1.302 src/sys/kern/subr_autoconf.c:1.303
--- src/sys/kern/subr_autoconf.c:1.302 Fri Aug 12 16:16:12 2022
+++ src/sys/kern/subr_autoconf.c Wed Aug 24 11:18:56 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_autoconf.c,v 1.302 2022/08/12 16:16:12 riastradh Exp $ */
+/* $NetBSD: subr_autoconf.c,v 1.303 2022/08/24 11:18:56 riastradh Exp $ */
/*
* Copyright (c) 1996, 2000 Christopher G. Demetriou
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.302 2022/08/12 16:16:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.303 2022/08/24 11:18:56 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -3137,17 +3137,17 @@ device_pmf_driver_shutdown(device_t dev,
return true;
}
-bool
+void
device_pmf_driver_register(device_t dev,
bool (*suspend)(device_t, const pmf_qual_t *),
bool (*resume)(device_t, const pmf_qual_t *),
bool (*shutdown)(device_t, int))
{
+
dev->dv_driver_suspend = suspend;
dev->dv_driver_resume = resume;
dev->dv_driver_shutdown = shutdown;
dev->dv_flags |= DVF_POWER_HANDLERS;
- return true;
}
void
Index: src/sys/sys/device.h
diff -u src/sys/sys/device.h:1.182 src/sys/sys/device.h:1.183
--- src/sys/sys/device.h:1.182 Mon Mar 28 12:38:59 2022
+++ src/sys/sys/device.h Wed Aug 24 11:18:56 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: device.h,v 1.182 2022/03/28 12:38:59 riastradh Exp $ */
+/* $NetBSD: device.h,v 1.183 2022/08/24 11:18:56 riastradh Exp $ */
/*
* Copyright (c) 2021 The NetBSD Foundation, Inc.
@@ -686,7 +686,7 @@ bool device_pmf_driver_suspend(device_t
bool device_pmf_driver_resume(device_t, const pmf_qual_t *);
bool device_pmf_driver_shutdown(device_t, int);
-bool device_pmf_driver_register(device_t,
+void device_pmf_driver_register(device_t,
bool (*)(device_t, const pmf_qual_t *),
bool (*)(device_t, const pmf_qual_t *),
bool (*)(device_t, int));
