diff --git a/sys/compat/linuxkpi/common/include/linux/pm.h b/sys/compat/linuxkpi/common/include/linux/pm.h
index d054a95f17a3..085b180642aa 100644
--- a/sys/compat/linuxkpi/common/include/linux/pm.h
+++ b/sys/compat/linuxkpi/common/include/linux/pm.h
@@ -1,72 +1,88 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2020 The FreeBSD Foundation
  *
  * This software was developed by Björn Zeeb under sponsorship from
  * the FreeBSD Foundation.
  *
  * 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT 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.
  *
  * $FreeBSD$
  */
 
 #ifndef	_LINUXKPI_LINUX_PM_H
 #define	_LINUXKPI_LINUX_PM_H
 
 #include <asm/atomic.h>
 
 /* Needed but breaks linux_usb.c */
 /* #include <linux/completion.h> */
 /* #include <linux/wait.h> */
 
 typedef struct pm_message {
 	int event;
 } pm_message_t;
 
 struct dev_pm_domain {
 };
 
 struct dev_pm_info {
 	atomic_t usage_count;
 };
 
 #define	PM_EVENT_FREEZE		0x0001
 #define	PM_EVENT_SUSPEND	0x0002
 
+#define	pm_sleep_ptr(_p)					\
+    IS_ENABLED(CONFIG_PM_SLEEP) ? (_p) : NULL
+
 #ifdef CONFIG_PM_SLEEP
 #define	SIMPLE_DEV_PM_OPS(_name, _suspendfunc, _resumefunc)	\
 const struct dev_pm_ops _name = {				\
-        .suspend	= _suspendfunc,				\
-        .resume		= _resumefunc,				\
-        .freeze		= _suspendfunc,				\
-        .thaw		= _resumefunc,				\
-        .poweroff	= _suspendfunc,				\
-        .restore	= _resumefunc,				\
+	.suspend	= _suspendfunc,		\
+	.resume		= _resumefunc,		\
+	.freeze		= _suspendfunc,		\
+	.thaw		= _resumefunc,		\
+	.poweroff	= _suspendfunc,		\
+	.restore	= _resumefunc,		\
+}
+
+#define	DEFINE_SIMPLE_DEV_PM_OPS(_name, _suspendfunc, _resumefunc) \
+const struct dev_pm_ops _name = {				\
+	.suspend	= _suspendfunc,		\
+	.resume		= _resumefunc,		\
+	.freeze		= _suspendfunc,		\
+	.thaw		= _resumefunc,		\
+	.poweroff	= _suspendfunc,		\
+	.restore	= _resumefunc,		\
 }
 #else
 #define	SIMPLE_DEV_PM_OPS(_name, _suspendfunc, _resumefunc)	\
 const struct dev_pm_ops _name = {				\
 }
+#define	DEFINE_SIMPLE_DEV_PM_OPS(_name, _suspendfunc, _resumefunc) \
+const struct dev_pm_ops _name = {				\
+}
 #endif
 
 #endif	/* _LINUXKPI_LINUX_PM_H */