CVS commit: src/sys/dev/ic

[SAITOH Masanobu]

Module Name:    src
Committed By:   msaitoh
Date:           Thu May 12 11:56:30 UTC 2022

Modified Files:
        src/sys/dev/ic: mfi.c mfireg.h

Log Message:
Don't use MFI_PD_LIST_SIZE. Same as OpenBSD. No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/sys/dev/ic/mfi.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/ic/mfireg.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/ic/mfi.c
diff -u src/sys/dev/ic/mfi.c:1.75 src/sys/dev/ic/mfi.c:1.76
--- src/sys/dev/ic/mfi.c:1.75	Tue May 10 14:13:37 2022
+++ src/sys/dev/ic/mfi.c	Thu May 12 11:56:29 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: mfi.c,v 1.75 2022/05/10 14:13:37 msaitoh Exp $ */
+/* $NetBSD: mfi.c,v 1.76 2022/05/12 11:56:29 msaitoh Exp $ */
 /* $OpenBSD: mfi.c,v 1.66 2006/11/28 23:59:45 dlg Exp $ */
 
 /*
@@ -73,7 +73,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.75 2022/05/10 14:13:37 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.76 2022/05/12 11:56:29 msaitoh Exp $");
 
 #include "bio.h"
 
@@ -2316,10 +2316,10 @@ mfi_ioctl_blink(struct mfi_softc *sc, st
 	if (bb->bb_channel == 0)
 		return EINVAL;
 
-	pd = malloc(MFI_PD_LIST_SIZE, M_DEVBUF, M_WAITOK);
+	pd = malloc(sizeof(*pd), M_DEVBUF, M_WAITOK);
 
 	if (mfi_mgmt_internal(sc, MR_DCMD_PD_GET_LIST, MFI_DATA_IN,
-	    MFI_PD_LIST_SIZE, pd, NULL, false))
+	    sizeof(*pd), pd, NULL, false))
 		goto done;
 
 	for (i = 0, found = 0; i < pd->mpl_no_pd; i++)
@@ -2371,10 +2371,10 @@ mfi_ioctl_setstate(struct mfi_softc *sc,
 	DNPRINTF(MFI_D_IOCTL, "%s: mfi_ioctl_setstate %x\n", DEVNAME(sc),
 	    bs->bs_status);
 
-	pd = malloc(MFI_PD_LIST_SIZE, M_DEVBUF, M_WAITOK);
+	pd = malloc(sizeof(*pd), M_DEVBUF, M_WAITOK);
 
 	if (mfi_mgmt_internal(sc, MR_DCMD_PD_GET_LIST, MFI_DATA_IN,
-	    MFI_PD_LIST_SIZE, pd, NULL, false))
+	    sizeof(*pd), pd, NULL, false))
 		goto done;
 
 	for (i = 0, found = 0; i < pd->mpl_no_pd; i++)

Index: src/sys/dev/ic/mfireg.h
diff -u src/sys/dev/ic/mfireg.h:1.18 src/sys/dev/ic/mfireg.h:1.19
--- src/sys/dev/ic/mfireg.h:1.18	Wed May 11 15:30:33 2022
+++ src/sys/dev/ic/mfireg.h	Thu May 12 11:56:29 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: mfireg.h,v 1.18 2022/05/11 15:30:33 msaitoh Exp $ */
+/* $NetBSD: mfireg.h,v 1.19 2022/05/12 11:56:29 msaitoh Exp $ */
 /* $OpenBSD: mfireg.h,v 1.24 2006/06/19 19:05:45 marco Exp $ */
 /*
  * Copyright (c) 2006 Marco Peereboom <ma...@peereboom.us>
@@ -1083,7 +1083,6 @@ struct mfi_pd_list {
 	uint32_t		mpl_no_pd;
 	struct mfi_pd_address	mpl_address[MFI_MAX_PD];
 } __packed;
-#define MFI_PD_LIST_SIZE	(sizeof(struct mfi_pd_list))
 
 struct mfi_pd {
 	uint16_t		mfp_id;