Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/pgoyette-compat]: src/sys In MODULE_HOOK_CALL_DECL we don't need to prov...
details: https://anonhg.NetBSD.org/src/rev/a601471e3178
branches: pgoyette-compat
changeset: 830842:a601471e3178
user: pgoyette <pgoyette%NetBSD.org@localhost>
date: Sat Sep 29 21:36:13 2018 +0000
description:
In MODULE_HOOK_CALL_DECL we don't need to provide the actual argument
list for calling the hook function, nor do we need to provide the
default value (for when the hook has not been set).
diffstat:
sys/arch/amd64/amd64/netbsd32_machdep.c | 7 +++----
sys/arch/mips/mips/netbsd32_machdep.c | 7 +++----
sys/compat/common/if_43.c | 6 +++---
sys/compat/netbsd32/netbsd32_module.c | 8 +++-----
sys/dev/bio.c | 7 +++----
sys/dev/ccd.c | 7 +++----
sys/dev/clockctl.c | 7 +++----
sys/dev/raidframe/rf_netbsdkintf.c | 12 ++++--------
sys/dev/sysmon/sysmon_power.c | 7 +++----
sys/dev/usb/ugen.c | 8 +++-----
sys/dev/usb/uhid.c | 8 +++-----
sys/dev/usb/usb.c | 11 ++++-------
sys/dev/vnd.c | 12 ++++--------
sys/dev/wscons/wsevent.c | 7 +++----
sys/fs/puffs/puffs_msgif.c | 10 ++++------
sys/kern/kern_proc.c | 8 ++++----
sys/kern/sys_module.c | 6 +++---
sys/net/if.c | 13 ++++++-------
sys/net/if_spppsubr.c | 6 +++---
sys/net/rtsock.c | 10 ++++------
sys/net80211/ieee80211_ioctl.c | 5 ++---
sys/opencrypto/cryptodev.c | 6 +++---
sys/sys/module_hook.h | 4 ++--
23 files changed, 76 insertions(+), 106 deletions(-)
diffs (truncated from 703 to 300 lines):
diff -r 9aeefe4cefac -r a601471e3178 sys/arch/amd64/amd64/netbsd32_machdep.c
--- a/sys/arch/amd64/amd64/netbsd32_machdep.c Sat Sep 29 10:59:00 2018 +0000
+++ b/sys/arch/amd64/amd64/netbsd32_machdep.c Sat Sep 29 21:36:13 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.115.2.10 2018/09/29 07:34:12 pgoyette Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.115.2.11 2018/09/29 21:36:13 pgoyette Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.115.2.10 2018/09/29 07:34:12 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.115.2.11 2018/09/29 21:36:13 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -276,8 +276,7 @@
struct netbsd32_sendsig_hook_t netbsd32_sendsig_hook;
MODULE_CALL_HOOK_DECL(netbsd32_sendsig_hook, f,
- (const ksiginfo_t *ksi, const sigset_t *mask), (ksi, mask),
- netbsd32_sendsig_siginfo(ksi, mask));
+ (const ksiginfo_t *ksi, const sigset_t *mask));
MODULE_CALL_HOOK(netbsd32_sendsig_hook, f,
(const ksiginfo_t *ksi, const sigset_t *mask), (ksi, mask),
netbsd32_sendsig_siginfo(ksi, mask));
diff -r 9aeefe4cefac -r a601471e3178 sys/arch/mips/mips/netbsd32_machdep.c
--- a/sys/arch/mips/mips/netbsd32_machdep.c Sat Sep 29 10:59:00 2018 +0000
+++ b/sys/arch/mips/mips/netbsd32_machdep.c Sat Sep 29 21:36:13 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.15.2.6 2018/09/29 10:22:36 pgoyette Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.15.2.7 2018/09/29 21:36:13 pgoyette Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.15.2.6 2018/09/29 10:22:36 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.15.2.7 2018/09/29 21:36:13 pgoyette Exp $");
#include "opt_compat_netbsd.h"
#include "opt_coredump.h"
@@ -310,8 +310,7 @@
struct netbsd32_sendsig_hook_t netbsd32_sendsig_hook;
MODULE_CALL_HOOK_DECL(netbsd32_sendsig_hook, f,
- (const ksiginfo_t *ksi, const sigset_t *mask), (ksi, mask),
- netbsd32_sendsig_siginfo(ksi, mask));
+ (const ksiginfo_t *ksi, const sigset_t *mask));
MODULE_CALL_HOOK(netbsd32_sendsig_hook, f,
(const ksiginfo_t *ksi, const sigset_t *mask), (ksi, mask),
netbsd32_sendsig_siginfo(ksi, mask));
diff -r 9aeefe4cefac -r a601471e3178 sys/compat/common/if_43.c
--- a/sys/compat/common/if_43.c Sat Sep 29 10:59:00 2018 +0000
+++ b/sys/compat/common/if_43.c Sat Sep 29 21:36:13 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: if_43.c,v 1.14.2.5 2018/09/21 02:56:22 pgoyette Exp $ */
+/* $NetBSD: if_43.c,v 1.14.2.6 2018/09/29 21:36:13 pgoyette Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1990, 1993
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_43.c,v 1.14.2.5 2018/09/21 02:56:22 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_43.c,v 1.14.2.6 2018/09/29 21:36:13 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -85,7 +85,7 @@
* XXX The if43_20 routine doesn't really have any effect, since its
* XXX return value is ignored (see compat/common/if_43.c)!
*/
-MODULE_CALL_HOOK_DECL(if43_20_hook, f, (u_long ncmd), (ncmd), enosys());
+MODULE_CALL_HOOK_DECL(if43_20_hook, f, (u_long ncmd));
MODULE_CALL_HOOK(if43_20_hook, f, (u_long ncmd), (ncmd), enosys());
/*
diff -r 9aeefe4cefac -r a601471e3178 sys/compat/netbsd32/netbsd32_module.c
--- a/sys/compat/netbsd32/netbsd32_module.c Sat Sep 29 10:59:00 2018 +0000
+++ b/sys/compat/netbsd32/netbsd32_module.c Sat Sep 29 21:36:13 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_module.c,v 1.6.2.8 2018/09/18 23:03:54 pgoyette Exp $ */
+/* $NetBSD: netbsd32_module.c,v 1.6.2.9 2018/09/29 21:36:14 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_module.c,v 1.6.2.8 2018/09/18 23:03:54 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_module.c,v 1.6.2.9 2018/09/29 21:36:14 pgoyette Exp $");
#include <sys/param.h>
#include <sys/dirent.h>
@@ -203,9 +203,7 @@
/* Module hook for netbsd32_80_modctl */
MODULE_CALL_HOOK_DECL(compat32_80_modctl_hook, f,
(struct lwp *lwp, const struct netbsd32_modctl_args *uap,
- register_t *result),
- (lwp, uap, result),
- enosys());
+ register_t *result));
MODULE_CALL_HOOK(compat32_80_modctl_hook, f,
(struct lwp *lwp, const struct netbsd32_modctl_args *uap,
register_t *result),
diff -r 9aeefe4cefac -r a601471e3178 sys/dev/bio.c
--- a/sys/dev/bio.c Sat Sep 29 10:59:00 2018 +0000
+++ b/sys/dev/bio.c Sat Sep 29 21:36:13 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: bio.c,v 1.13.16.4 2018/09/18 23:03:54 pgoyette Exp $ */
+/* $NetBSD: bio.c,v 1.13.16.5 2018/09/29 21:36:14 pgoyette Exp $ */
/* $OpenBSD: bio.c,v 1.9 2007/03/20 02:35:55 marco Exp $ */
/*
@@ -28,7 +28,7 @@
/* A device controller ioctl tunnelling device. */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bio.c,v 1.13.16.4 2018/09/18 23:03:54 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bio.c,v 1.13.16.5 2018/09/29 21:36:14 pgoyette Exp $");
#include "opt_compat_netbsd.h"
@@ -116,8 +116,7 @@
/* Hook up the compat_bio_30 routine */
MODULE_CALL_HOOK_DECL(compat_bio_30_hook, f,
- (void * cookie, u_long cmd, void *addr, int(*ff)(void *, u_long, void *)),
- (cookie, cmd, addr, ff), enosys());
+ (void * cookie, u_long cmd, void *addr, int(*ff)(void *, u_long, void *)));
MODULE_CALL_HOOK(compat_bio_30_hook, f,
(void * cookie, u_long cmd, void *addr, int(*ff)(void *, u_long, void *)),
(cookie, cmd, addr, ff), enosys());
diff -r 9aeefe4cefac -r a601471e3178 sys/dev/ccd.c
--- a/sys/dev/ccd.c Sat Sep 29 10:59:00 2018 +0000
+++ b/sys/dev/ccd.c Sat Sep 29 21:36:13 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ccd.c,v 1.175.2.7 2018/09/18 23:03:54 pgoyette Exp $ */
+/* $NetBSD: ccd.c,v 1.175.2.8 2018/09/29 21:36:14 pgoyette Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999, 2007, 2009 The NetBSD Foundation, Inc.
@@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.175.2.7 2018/09/18 23:03:54 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.175.2.8 2018/09/29 21:36:14 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -1063,8 +1063,7 @@
*/
MODULE_CALL_HOOK_DECL(ccd_ioctl_60_hook, f, (dev_t dev, u_long cmd, void *data,
int flag, struct lwp *l, int (*ff)(dev_t, u_long, void *, int,
- struct lwp *)),
- (dev, cmd, data, flag, l, ccdioctl), enosys());
+ struct lwp *)));
MODULE_CALL_HOOK(ccd_ioctl_60_hook, f, (dev_t dev, u_long cmd, void *data,
int flag, struct lwp *l, int (*ff)(dev_t, u_long, void *, int,
struct lwp *)),
diff -r 9aeefe4cefac -r a601471e3178 sys/dev/clockctl.c
--- a/sys/dev/clockctl.c Sat Sep 29 10:59:00 2018 +0000
+++ b/sys/dev/clockctl.c Sat Sep 29 21:36:13 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: clockctl.c,v 1.35.14.7 2018/09/27 03:07:21 pgoyette Exp $ */
+/* $NetBSD: clockctl.c,v 1.35.14.8 2018/09/29 21:36:14 pgoyette Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clockctl.c,v 1.35.14.7 2018/09/27 03:07:21 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clockctl.c,v 1.35.14.8 2018/09/29 21:36:14 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_ntp.h"
@@ -202,8 +202,7 @@
/* Hook the compat_50 stuff */
MODULE_CALL_HOOK_DECL(clockctl_ioctl_50_hook, f,
- (dev_t dev, u_long cmd, void *data, int flags, struct lwp *l),
- (dev, cmd, data, flags, l), enosys());
+ (dev_t dev, u_long cmd, void *data, int flags, struct lwp *l));
MODULE_CALL_HOOK(clockctl_ioctl_50_hook, f,
(dev_t dev, u_long cmd, void *data, int flags, struct lwp *l),
(dev, cmd, data, flags, l), enosys());
diff -r 9aeefe4cefac -r a601471e3178 sys/dev/raidframe/rf_netbsdkintf.c
--- a/sys/dev/raidframe/rf_netbsdkintf.c Sat Sep 29 10:59:00 2018 +0000
+++ b/sys/dev/raidframe/rf_netbsdkintf.c Sat Sep 29 21:36:13 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.356.2.5 2018/09/18 23:03:54 pgoyette Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.356.2.6 2018/09/29 21:36:14 pgoyette Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008-2011 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
***********************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.356.2.5 2018/09/18 23:03:54 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.356.2.6 2018/09/29 21:36:14 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -1040,9 +1040,7 @@
/* Hooks to call the 5.0 and 8.0 ioctl compat code */
MODULE_CALL_HOOK_DECL(raidframe50_ioctl_hook, f,
(int cmd, int initted, RF_Raid_t *raidPtr, int unit, void *data,
- RF_Config_t **k_cfg),
- (cmd, initted, raidPtr, unit, data, k_cfg),
- enosys());
+ RF_Config_t **k_cfg));
MODULE_CALL_HOOK(raidframe50_ioctl_hook, f,
(int cmd, int initted, RF_Raid_t *raidPtr, int unit, void *data,
RF_Config_t **k_cfg),
@@ -1051,9 +1049,7 @@
MODULE_CALL_HOOK_DECL(raidframe80_ioctl_hook, f,
(int cmd, int initted, RF_Raid_t *raidPtr, int unit, void *data,
- RF_Config_t **k_cfg),
- (cmd, initted, raidPtr, unit, data, k_cfg),
- enosys());
+ RF_Config_t **k_cfg));
MODULE_CALL_HOOK(raidframe80_ioctl_hook, f,
(int cmd, int initted, RF_Raid_t *raidPtr, int unit, void *data,
RF_Config_t **k_cfg),
diff -r 9aeefe4cefac -r a601471e3178 sys/dev/sysmon/sysmon_power.c
--- a/sys/dev/sysmon/sysmon_power.c Sat Sep 29 10:59:00 2018 +0000
+++ b/sys/dev/sysmon/sysmon_power.c Sat Sep 29 21:36:13 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmon_power.c,v 1.58.2.4 2018/09/18 23:03:54 pgoyette Exp $ */
+/* $NetBSD: sysmon_power.c,v 1.58.2.5 2018/09/29 21:36:14 pgoyette Exp $ */
/*-
* Copyright (c) 2007 Juan Romero Pardines.
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sysmon_power.c,v 1.58.2.4 2018/09/18 23:03:54 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sysmon_power.c,v 1.58.2.5 2018/09/29 21:36:14 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -319,8 +319,7 @@
* Call the compat hook function
*/
MODULE_CALL_HOOK_DECL(compat_sysmon_power_40_hook, f,
- (power_event_t *pev, struct sysmon_pswitch *pswitch, int event),
- (pev, pswitch, event), enosys());
+ (power_event_t *pev, struct sysmon_pswitch *pswitch, int event));
MODULE_CALL_HOOK(compat_sysmon_power_40_hook, f,
(power_event_t *pev, struct sysmon_pswitch *pswitch, int event),
(pev, pswitch, event), enosys());
diff -r 9aeefe4cefac -r a601471e3178 sys/dev/usb/ugen.c
--- a/sys/dev/usb/ugen.c Sat Sep 29 10:59:00 2018 +0000
+++ b/sys/dev/usb/ugen.c Sat Sep 29 21:36:13 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ugen.c,v 1.139.2.4 2018/09/18 23:03:55 pgoyette Exp $ */
+/* $NetBSD: ugen.c,v 1.139.2.5 2018/09/29 21:36:14 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.139.2.4 2018/09/18 23:03:55 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ugen.c,v 1.139.2.5 2018/09/29 21:36:14 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -1442,9 +1442,7 @@
MODULE_CALL_HOOK_DECL(usb_subr_30_hook, f1,
(struct usbd_device *udev, struct usb_device_info_old * addr, int usedev,
void (*fill_devinfo_vp)(struct usbd_device *, char *, size_t, char *,
- size_t, int, int), int (*printBCD)(char *, size_t, int)),
- (udev, addr, usedev, fill_devinfo_vp, printBCD),
- enosys());
+ size_t, int, int), int (*printBCD)(char *, size_t, int)));
Static int
ugen_do_ioctl(struct ugen_softc *sc, int endpt, u_long cmd,
diff -r 9aeefe4cefac -r a601471e3178 sys/dev/usb/uhid.c
--- a/sys/dev/usb/uhid.c Sat Sep 29 10:59:00 2018 +0000
+++ b/sys/dev/usb/uhid.c Sat Sep 29 21:36:13 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: uhid.c,v 1.101.2.4 2018/09/18 23:03:55 pgoyette Exp $ */
+/* $NetBSD: uhid.c,v 1.101.2.5 2018/09/29 21:36:14 pgoyette Exp $ */
Home |
Main Index |
Thread Index |
Old Index