From owner-svn-src-head@freebsd.org  Sat Nov  7 23:05:25 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 260CCA21969;
 Sat,  7 Nov 2015 23:05:25 +0000 (UTC) (envelope-from cem@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id DB11F14A4;
 Sat,  7 Nov 2015 23:05:24 +0000 (UTC) (envelope-from cem@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA7N5NLP017644;
 Sat, 7 Nov 2015 23:05:23 GMT (envelope-from cem@FreeBSD.org)
Received: (from cem@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA7N5NNj017643;
 Sat, 7 Nov 2015 23:05:23 GMT (envelope-from cem@FreeBSD.org)
Message-Id: <201511072305.tA7N5NNj017643@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: cem set sender to cem@FreeBSD.org
 using -f
From: "Conrad E. Meyer" <cem@FreeBSD.org>
Date: Sat, 7 Nov 2015 23:05:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r290519 - head/sys/dev/hptmv
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Nov 2015 23:05:25 -0000

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) 	
 	{