diff options
| author | Toomas Soome <tsoome@me.com> | 2018-10-19 20:46:00 +0300 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2019-02-20 22:42:02 +0200 |
| commit | b9e319bfd413f32cc39ec7b8ccc527f35712da7f (patch) | |
| tree | 2ae94314db90bdc1d6752035904ba6a6fda660fd /usr/src | |
| parent | 4fa33403ece8f42c56cba2b672d10f6ab4dc32cd (diff) | |
| download | illumos-joyent-b9e319bfd413f32cc39ec7b8ccc527f35712da7f.tar.gz | |
10419 ntxn: cast between incompatible function types
Reviewed by: Andy Stormont <astormont@racktopsystems.com>
Reviewed by: C Fraire <cfraire@me.com>
Reviewed by: Andy Fiddaman <andy@omniosce.org>
Approved by: Robert Mustacchi <rm@joyent.com>
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/uts/common/io/ntxn/unm_nic_main.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/usr/src/uts/common/io/ntxn/unm_nic_main.c b/usr/src/uts/common/io/ntxn/unm_nic_main.c index 8e395bb58b..4cf989f5dc 100644 --- a/usr/src/uts/common/io/ntxn/unm_nic_main.c +++ b/usr/src/uts/common/io/ntxn/unm_nic_main.c @@ -123,8 +123,8 @@ static boolean_t ntxn_m_getcapab(void *arg, mac_capab_t cap, void *cap_data); */ int unm_pci_alloc_consistent(unm_adapter *adapter, - int size, caddr_t *address, ddi_dma_cookie_t *cookie, - ddi_dma_handle_t *dma_handle, ddi_acc_handle_t *handlep) + int size, caddr_t *address, ddi_dma_cookie_t *cookie, + ddi_dma_handle_t *dma_handle, ddi_acc_handle_t *handlep) { int err; uint32_t ncookies; @@ -1148,9 +1148,9 @@ unm_nic_check_temp(struct unm_adapter_s *adapter) } static void -unm_watchdog(unsigned long v) +unm_watchdog(void *v) { - unm_adapter *adapter = (unm_adapter *)v; + unm_adapter *adapter = v; if ((adapter->portnum == 0) && unm_nic_check_temp(adapter)) { /* @@ -1165,8 +1165,8 @@ unm_watchdog(unsigned long v) /* * This function schedules a call for itself. */ - adapter->watchdog_timer = timeout((void (*)(void *))&unm_watchdog, - (void *)adapter, 2 * drv_usectohz(1000000)); + adapter->watchdog_timer = timeout(&unm_watchdog, + adapter, 2 * drv_usectohz(1000000)); } @@ -1566,8 +1566,8 @@ unm_post_rx_buffers_nodb(struct unm_adapter_s *adapter, unm_rcv_desc_ctx_t *rcv_desc = &recv_ctx->rcv_desc[ringid]; struct unm_rx_buffer *rx_buffer; rcvDesc_t *pdesc; - int count, producer = rcv_desc->producer; - int last_producer = producer; + int count, producer = rcv_desc->producer; + int last_producer = producer; for (count = 0; count < rcv_desc->rx_desc_handled; count++) { rx_buffer = unm_reserve_rx_buffer(rcv_desc); @@ -1606,7 +1606,7 @@ unm_post_rx_buffers_nodb(struct unm_adapter_s *adapter, int unm_nic_fill_statistics_128M(struct unm_adapter_s *adapter, - struct unm_statistics *unm_stats) + struct unm_statistics *unm_stats) { void *addr; if (adapter->ahw.board_type == UNM_NIC_XGBE) { @@ -2108,7 +2108,7 @@ unm_kstat_update(kstat_t *ksp, int flag) static kstat_t * unm_setup_named_kstat(unm_adapter *adapter, int instance, char *name, - const unm_ksindex_t *ksip, size_t size, int (*update)(kstat_t *, int)) + const unm_ksindex_t *ksip, size_t size, int (*update)(kstat_t *, int)) { kstat_t *ksp; kstat_named_t *knp; |