From: jon@elytron.openbsd.amsterdam
Subject: Couple of style corrections
To: tech@openbsd.org
Cc: jsg@jsg.id.au
Date: Tue, 11 Jun 2024 18:28:35 +0000

Hello, just a couple of style corrections and suggestions again,
diff follows

Index: sys/conf.h
===================================================================
RCS file: /cvs/src/sys/sys/conf.h,v
retrieving revision 1.163
diff -u -p -r1.163 conf.h
--- sys/conf.h	11 Jun 2024 01:49:17 -0000	1.163
+++ sys/conf.h	11 Jun 2024 18:06:05 -0000
@@ -285,7 +285,7 @@ extern struct cdevsw cdevsw[];
 	(dev_type_mmap((*))) enodev }
 
 /* open, close, ioctl */
-#define       cdev_uk_init(c,n) { \
+#define cdev_uk_init(c,n) { \
 	dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
 	(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
 	(dev_type_stop((*))) enodev, 0, \
@@ -438,14 +438,14 @@ extern struct cdevsw cdevsw[];
 	(dev_type_mmap((*))) enodev }
 
 /* open, close, ioctl */
-#define       cdev_bio_init(c,n) { \
+#define cdev_bio_init(c,n) { \
 	dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
 	(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
 	(dev_type_stop((*))) enodev, 0, \
 	(dev_type_mmap((*))) enodev }
 
 /* open, close, read, ioctl, mmap, nokqfilter */
-#define      cdev_drm_init(c,n)        { \
+#define cdev_drm_init(c,n)        { \
 	dev_init(c,n,open), dev_init(c,n,close), dev_init(c, n, read), \
 	(dev_type_write((*))) enodev, dev_init(c,n,ioctl), \
 	(dev_type_stop((*))) enodev, 0, \


Index: arch/macppc/macppc/ofw_machdep.c
===================================================================
RCS file: /cvs/src/sys/arch/macppc/macppc/ofw_machdep.c,v
retrieving revision 1.65
diff -u -p -r1.65 ofw_machdep.c
--- arch/macppc/macppc/ofw_machdep.c	13 Apr 2024 23:44:11 -0000	1.65
+++ arch/macppc/macppc/ofw_machdep.c	11 Jun 2024 18:05:54 -0000
@@ -32,8 +32,6 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "akbd.h"
-#include "ukbd.h"
 #include "wsdisplay.h"
 #include "zstty.h"
 
@@ -53,17 +51,19 @@
 #include <macppc/macppc/ofw_machdep.h>
 
 #if NAKBD > 0
+#include "akbd.h"
 #include <dev/adb/akbdvar.h>
 #endif
 
 #if NUKBD > 0
+#include "ukbd.h"
 #include <dev/usb/ukbdvar.h>
 #endif