5 files changed, 3 insertions, 30 deletions

diff --git a/sys/dev/liquidio/base/lio_request_manager.c b/sys/dev/liquidio/base/lio_request_manager.c
index f4eae0c8bf31..95eac12ecf3b 100644
--- a/sys/dev/liquidio/base/lio_request_manager.c
+++ b/sys/dev/liquidio/base/lio_request_manager.c
@@ -159,11 +159,6 @@ lio_init_instr_queue(struct octeon_device *oct, union octeon_txpciq txpciq,
 	db_tq = &oct->check_db_tq[iq_no];
 	db_tq->tq = taskqueue_create("lio_check_db_timeout", M_WAITOK,
 				     taskqueue_thread_enqueue, &db_tq->tq);
-	if (db_tq->tq == NULL) {
-		lio_dev_err(oct, "check db wq create failed for iq %d\n",
-			    iq_no);
-		return (1);
-	}
 
 	TIMEOUT_TASK_INIT(db_tq->tq, &db_tq->work, 0, lio_check_db_timeout,
 			  (void *)db_tq);
@@ -179,10 +174,6 @@ lio_init_instr_queue(struct octeon_device *oct, union octeon_txpciq txpciq,
 	oct->instr_queue[iq_no]->br =
 		buf_ring_alloc(LIO_BR_SIZE, M_DEVBUF, M_WAITOK,
 			       &oct->instr_queue[iq_no]->enq_lock);
-	if (oct->instr_queue[iq_no]->br == NULL) {
-		lio_dev_err(oct, "Critical Failure setting up buf ring\n");
-		return (1);
-	}
 
 	return (0);
 }
diff --git a/sys/dev/liquidio/base/lio_response_manager.c b/sys/dev/liquidio/base/lio_response_manager.c
index 12a3ad60521e..ac5fc6229885 100644
--- a/sys/dev/liquidio/base/lio_response_manager.c
+++ b/sys/dev/liquidio/base/lio_response_manager.c
@@ -59,10 +59,6 @@ lio_setup_response_list(struct octeon_device *oct)
 	ctq = &oct->dma_comp_tq;
 	ctq->tq = taskqueue_create("lio_dma_comp", M_WAITOK,
 				   taskqueue_thread_enqueue, &ctq->tq);
-	if (ctq->tq == NULL) {
-		lio_dev_err(oct, "failed to create wq thread\n");
-		return (-ENOMEM);
-	}
 
 	TIMEOUT_TASK_INIT(ctq->tq, &ctq->work, 0, lio_poll_req_completion,
 			  (void *)ctq);
diff --git a/sys/dev/liquidio/lio_ioctl.c b/sys/dev/liquidio/lio_ioctl.c
index 10c88b209051..b2fd54f59580 100644
--- a/sys/dev/liquidio/lio_ioctl.c
+++ b/sys/dev/liquidio/lio_ioctl.c
@@ -481,7 +481,7 @@ lio_get_new_flags(if_t ifp)
 		 * Accept all multicast addresses if there are more than we
 		 * can handle
 		 */
-		if (if_getamcount(ifp) > LIO_MAX_MULTICAST_ADDR)
+		if (if_llmaddr_count(ifp) > LIO_MAX_MULTICAST_ADDR)
 			f |= LIO_IFFLAG_ALLMULTI;
 	}
 	if (if_getflags(ifp) & IFF_BROADCAST)
diff --git a/sys/dev/liquidio/lio_main.c b/sys/dev/liquidio/lio_main.c
index bec510af0c65..3c73a6b10eed 100644
--- a/sys/dev/liquidio/lio_main.c
+++ b/sys/dev/liquidio/lio_main.c
@@ -200,7 +200,6 @@ lio_probe(device_t dev)
 	uint16_t	device_id;
 	uint16_t	subdevice_id;
 	uint8_t		revision_id;
-	char		device_ver[256];
 
 	vendor_id = pci_get_vendor(dev);
 	if (vendor_id != PCI_VENDOR_ID_CAVIUM)
@@ -216,9 +215,8 @@ lio_probe(device_t dev)
 		    (device_id == tbl->device_id) &&
 		    (subdevice_id == tbl->subdevice_id) &&
 		    (revision_id == tbl->revision_id)) {
-			sprintf(device_ver, "%s, Version - %s",
-				lio_strings[tbl->index], LIO_VERSION);
-			device_set_desc_copy(dev, device_ver);
+			device_set_descf(dev, "%s, Version - %s",
+			    lio_strings[tbl->index], LIO_VERSION);
 			return (BUS_PROBE_DEFAULT);
 		}
 
@@ -1329,11 +1327,6 @@ lio_setup_nic_devices(struct octeon_device *octeon_dev)
 
 		ifp = if_alloc(IFT_ETHER);
 
-		if (ifp == NULL) {
-			lio_dev_err(octeon_dev, "Device allocation failed\n");
-			goto setup_nic_dev_fail;
-		}
-
 		lio = malloc(sizeof(struct lio), M_DEVBUF, M_NOWAIT | M_ZERO);
 
 		if (lio == NULL) {
@@ -1861,10 +1854,6 @@ lio_setup_rx_oom_poll_fn(if_t ifp)
 	rx_status_tq->tq = taskqueue_create("lio_rx_oom_status", M_WAITOK,
 					    taskqueue_thread_enqueue,
 					    &rx_status_tq->tq);
-	if (rx_status_tq->tq == NULL) {
-		lio_dev_err(oct, "unable to create lio rx oom status tq\n");
-		return (-1);
-	}
 
 	TIMEOUT_TASK_INIT(rx_status_tq->tq, &rx_status_tq->work, 0,
 			  lio_poll_check_rx_oom_status, (void *)rx_status_tq);
diff --git a/sys/dev/liquidio/lio_sysctl.c b/sys/dev/liquidio/lio_sysctl.c
index 729f4d432274..61a7e96098c8 100644
--- a/sys/dev/liquidio/lio_sysctl.c
+++ b/sys/dev/liquidio/lio_sysctl.c
@@ -744,9 +744,6 @@ lio_get_regs(SYSCTL_HANDLER_ARGS)
 	regbuf = malloc(sizeof(char) * LIO_REGDUMP_LEN_XXXX, M_DEVBUF,
 			M_WAITOK | M_ZERO);
 
-	if (regbuf == NULL)
-		return (error);
-
 	switch (oct->chip_id) {
 	case LIO_CN23XX_PF_VID:
 		len += lio_cn23xx_pf_read_csr_reg(regbuf, oct);