net/sfc/base: fix warnings from VS2015 C compiler (C4057)
authorAndrew Lee <alee@solarflare.com>
Thu, 16 Nov 2017 08:04:36 +0000 (08:04 +0000)
committerFerruh Yigit <ferruh.yigit@intel.com>
Tue, 16 Jan 2018 17:47:49 +0000 (18:47 +0100)
Fix two level 4 warnings
"C4057: 'function': 'const uint8_t *' differs in indirection to
slightly different base types from 'caddr_t'"; no functional changes.

Fixes: 354df7eadf66 ("net/sfc/base: import bootrom configuration")
Cc: stable@dpdk.org
Signed-off-by: Andrew Lee <alee@solarflare.com>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
drivers/net/sfc/base/efx.h
drivers/net/sfc/base/efx_bootcfg.c

index 151aae8..1b1be82 100644 (file)
@@ -1506,13 +1506,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 */
index 660d000..75f7388 100644 (file)
@@ -290,7 +290,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;
@@ -353,7 +353,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);
@@ -430,7 +430,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;