svn commit: r342326 - stable/12/sys/dev/sfxge/common

[Andrew Rybchenko]

Author: arybchik
Date: Fri Dec 21 16:07:13 2018
New Revision: 342326
URL: https://svnweb.freebsd.org/changeset/base/342326

Log:
  MFC r340890
  
  sfxge(4): fix warnings from VS2015 C compiler (C4057)
  
  Fix two level 4 warnings
  "C4057: 'function': 'const uint8_t *' differs in indirection to
  slightly different base types from 'caddr_t'"; no functional changes.
  
  Submitted by:   Andrew Lee <alee at solarflare.com>
  Sponsored by:   Solarflare Communications, Inc.
  Differential Revision:  https://reviews.freebsd.org/D18124

Modified:
  stable/12/sys/dev/sfxge/common/efx.h
  stable/12/sys/dev/sfxge/common/efx_bootcfg.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/sfxge/common/efx.h
==============================================================================
--- stable/12/sys/dev/sfxge/common/efx.h	Fri Dec 21 16:06:25 2018	(r342325)
+++ stable/12/sys/dev/sfxge/common/efx.h	Fri Dec 21 16:07:13 2018	(r342326)
@@ -1466,13 +1466,13 @@ efx_bootcfg_copy_sector(
 extern				efx_rc_t
 efx_bootcfg_read(
 	__in			efx_nic_t *enp,
-	__out_bcount(size)	caddr_t data,
+	__out_bcount(size)	uint8_t *data,
 	__in			size_t size);
 
 extern				efx_rc_t
 efx_bootcfg_write(
 	__in			efx_nic_t *enp,
-	__in_bcount(size)	caddr_t data,
+	__in_bcount(size)	uint8_t *data,
 	__in			size_t size);
 
 #endif	/* EFSYS_OPT_BOOTCFG */

Modified: stable/12/sys/dev/sfxge/common/efx_bootcfg.c
==============================================================================
--- stable/12/sys/dev/sfxge/common/efx_bootcfg.c	Fri Dec 21 16:06:25 2018	(r342325)
+++ stable/12/sys/dev/sfxge/common/efx_bootcfg.c	Fri Dec 21 16:07:13 2018	(r342326)
@@ -295,7 +295,7 @@ fail1:
 				efx_rc_t
 efx_bootcfg_read(
 	__in			efx_nic_t *enp,
-	__out_bcount(size)	caddr_t data,
+	__out_bcount(size)	uint8_t *data,
 	__in			size_t size)
 {
 	uint8_t *payload = NULL;
@@ -358,7 +358,7 @@ efx_bootcfg_read(
 		goto fail7;
 
 	/* Verify that the area is correctly formatted and checksummed */
-	rc = efx_bootcfg_verify(enp, (caddr_t)payload, sector_length,
+	rc = efx_bootcfg_verify(enp, payload, sector_length,
 	    &used_bytes);
 	if (rc != 0 || used_bytes == 0) {
 		payload[0] = (uint8_t)(~DHCP_END & 0xff);
@@ -435,7 +435,7 @@ fail1:
 				efx_rc_t
 efx_bootcfg_write(
 	__in			efx_nic_t *enp,
-	__in_bcount(size)	caddr_t data,
+	__in_bcount(size)	uint8_t *data,
 	__in			size_t size)
 {
 	uint8_t *partn_data;