hptmv(4): Fix broken sysctl(9) API assumptions

Sponsored by:	EMC / Isilon Storage Division

diff --git a/sys/dev/hptmv/hptproc.c b/sys/dev/hptmv/hptproc.c
index 7971e73040b2a437777cdd489242bfbab7059f0f..3981b71eb2a5bc957cf14422d79c9e3e226fd6ba 100644 (file)
--- a/sys/dev/hptmv/hptproc.c
+++ b/sys/dev/hptmv/hptproc.c
@@ -51,9 +51,6 @@ int hpt_rescan_all(void);
 static char hptproc_buffer[256];
 extern char DRIVER_VERSION[];
 
-#define FORMAL_HANDLER_ARGS struct sysctl_oid *oidp, void *arg1,       \
-       intptr_t arg2, struct sysctl_req *req
-#define REAL_HANDLER_ARGS oidp, arg1, arg2, req
 typedef struct sysctl_req HPT_GET_INFO;
 
 static int
@@ -572,7 +569,7 @@ hpt_get_info(IAL_ADAPTER_T *pAdapter, HPT_GET_INFO *pinfo)
 }
 
 static __inline int
-hpt_proc_in(FORMAL_HANDLER_ARGS, int *len)
+hpt_proc_in(SYSCTL_HANDLER_ARGS, int *len)
 {
        int i, error=0;
 
@@ -590,12 +587,12 @@ hpt_proc_in(FORMAL_HANDLER_ARGS, int *len)
 }
 
 static int
-hpt_status(FORMAL_HANDLER_ARGS)
+hpt_status(SYSCTL_HANDLER_ARGS)
 {
        int length, error=0, retval=0;
        IAL_ADAPTER_T *pAdapter;
 
-       error = hpt_proc_in(REAL_HANDLER_ARGS, &length);
+       error = hpt_proc_in(oidp, arg1, arg2, req, &length);
        
     if (req->newptr != NULL)   
        {