Don't waste kernel bytes with an unused ioctl function which always
returns ENODEV, when you can use the generic one intended for that
usage.
Index: dev/ic/lpt.c
===================================================================
RCS file: /cvs/src/sys/dev/ic/lpt.c,v
retrieving revision 1.7
diff -u -p -r1.7 lpt.c
--- dev/ic/lpt.c 6 Aug 2010 00:00:41 -0000 1.7
+++ dev/ic/lpt.c 16 Sep 2011 21:03:00 -0000
@@ -59,7 +59,6 @@
#include <sys/proc.h>
#include <sys/buf.h>
#include <sys/kernel.h>
-#include <sys/ioctl.h>
#include <sys/uio.h>
#include <sys/device.h>
#include <sys/conf.h>
@@ -429,22 +428,4 @@ lptintr(arg)
}
return 1;
-}
-
-int
-lptioctl(dev, cmd, data, flag, p)
- dev_t dev;
- u_long cmd;
- caddr_t data;
- int flag;
- struct proc *p;
-{
- int error = 0;
-
- switch (cmd) {
- default:
- error = ENODEV;
- }
-
- return error;
}
Index: dev/usb/ulpt.c
===================================================================
RCS file: /cvs/src/sys/dev/usb/ulpt.c,v
retrieving revision 1.39
diff -u -p -r1.39 ulpt.c
--- dev/usb/ulpt.c 3 Jul 2011 15:47:17 -0000 1.39
+++ dev/usb/ulpt.c 16 Sep 2011 21:03:00 -0000
@@ -42,7 +42,6 @@
#include <sys/proc.h>
#include <sys/kernel.h>
#include <sys/device.h>
-#include <sys/ioctl.h>
#include <sys/uio.h>
#include <sys/conf.h>
#include <sys/vnode.h>
@@ -606,19 +605,6 @@ ulptwrite(dev_t dev, struct uio *uio, in
error = ulpt_do_write(sc, uio, flags);
if (--sc->sc_refcnt < 0)
usb_detach_wakeup(&sc->sc_dev);
- return (error);
-}
-
-int
-ulptioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
-{
- int error = 0;
-
- switch (cmd) {
- default:
- error = ENODEV;
- }
-
return (error);
}
Index: sys/conf.h
===================================================================
RCS file: /cvs/src/sys/sys/conf.h,v
retrieving revision 1.115
diff -u -p -r1.115 conf.h
--- sys/conf.h 6 Jul 2011 14:49:30 -0000 1.115
+++ sys/conf.h 16 Sep 2011 21:03:00 -0000
@@ -392,11 +392,11 @@ extern struct cdevsw cdevsw[];
(dev_type_stop((*))) enodev, 0, selfalse, \
(dev_type_mmap((*))) enodev }
-/* open, close, write, ioctl */
+/* open, close, write */
#define cdev_ulpt_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
- dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \
- 0, selfalse, (dev_type_mmap((*))) enodev }
+ dev_init(c,n,write), (dev_type_ioctl((*))) enodev, \
+ (dev_type_stop((*))) enodev, 0, selfalse, (dev_type_mmap((*))) enodev }
/* open, close, ioctl */
#define cdev_pf_init(c,n) { \
@@ -453,11 +453,11 @@ extern struct cdevsw cdevsw[];
0, seltrue, (dev_type_mmap((*))) enodev, \
0, 0, seltrue_kqfilter }
-/* open, close, write, ioctl */
+/* open, close, write */
#define cdev_lpt_init(c,n) { \
dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \
- dev_init(c,n,write), dev_init(c,n,ioctl), (dev_type_stop((*))) enodev, \
- 0, seltrue, (dev_type_mmap((*))) enodev, \
+ dev_init(c,n,write), (dev_type_ioctl((*))) enodev, \
+ (dev_type_stop((*))) enodev, 0, seltrue, (dev_type_mmap((*))) enodev, \
0, 0, seltrue_kqfilter }
/* open, close, read, ioctl, mmap */
