svn commit: r290519 - head/sys/dev/hptmv

[Conrad E. Meyer]

Author: cem
Date: Sat Nov  7 23:05:23 2015
New Revision: 290519
URL: https://svnweb.freebsd.org/changeset/base/290519

Log:
  hptmv(4): Fix broken sysctl(9) API assumptions
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/sys/dev/hptmv/hptproc.c

Modified: head/sys/dev/hptmv/hptproc.c
==============================================================================
--- head/sys/dev/hptmv/hptproc.c	Sat Nov  7 22:58:56 2015	(r290518)
+++ head/sys/dev/hptmv/hptproc.c	Sat Nov  7 23:05:23 2015	(r290519)
@@ -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, HP
 }
 
 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 *le
 }
 
 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) 	
 	{