Commit d602de8e authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

drivers/net: Fix various unnecessary characters after logging newlines 



Remove and coalesce formats when there is an unnecessary
character after a logging newline.  These extra characters
cause logging defects.

Miscellanea:

o Coalesce formats

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 37c9102f

drivers/net/ethernet/cavium/liquidio/lio_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1766,7 +1766,7 @@ static int load_firmware(struct octeon_device *oct) 


	ret = request_firmware(&fw, fw_name, &oct->pci_dev->dev);

	if (ret) {

		dev_err(&oct->pci_dev->dev, "Request firmware failed. Could not find file %s.\n.",

		dev_err(&oct->pci_dev->dev, "Request firmware failed. Could not find file %s.\n",

			fw_name);

		release_firmware(fw);

		return ret;

drivers/net/ethernet/qlogic/netxen/netxen_nic_ctx.c

+2 −4
Original line number Diff line number Diff line
@@ -146,8 +146,7 @@ netxen_get_minidump_template(struct netxen_adapter *adapter) 
	if ((cmd.rsp.cmd == NX_RCODE_SUCCESS) && (size == cmd.rsp.arg2)) {

		memcpy(adapter->mdump.md_template, addr, size);

	} else {

		dev_err(&adapter->pdev->dev, "Failed to get minidump template, "

			"err_code : %d, requested_size : %d, actual_size : %d\n ",

		dev_err(&adapter->pdev->dev, "Failed to get minidump template, err_code : %d, requested_size : %d, actual_size : %d\n",

			cmd.rsp.cmd, size, cmd.rsp.arg2);

	}

	pci_free_consistent(adapter->pdev, size, addr, md_template_addr);
@@ -180,8 +179,7 @@ netxen_setup_minidump(struct netxen_adapter *adapter) 
		if ((err == NX_RCODE_CMD_INVALID) ||

			(err == NX_RCODE_CMD_NOT_IMPL)) {

			dev_info(&adapter->pdev->dev,

				"Flashed firmware version does not support minidump, "

				"minimum version required is [ %u.%u.%u ].\n ",

				"Flashed firmware version does not support minidump, minimum version required is [ %u.%u.%u ]\n",

				NX_MD_SUPPORT_MAJOR, NX_MD_SUPPORT_MINOR,

				NX_MD_SUPPORT_SUBVERSION);

		}

drivers/net/ethernet/qlogic/qed/qed_dev.c

+1 −1
Original line number Diff line number Diff line
@@ -1098,7 +1098,7 @@ int qed_final_cleanup(struct qed_hwfn *p_hwfn, 
	}



	DP_VERBOSE(p_hwfn, QED_MSG_IOV,

		   "Sending final cleanup for PFVF[%d] [Command %08x\n]",

		   "Sending final cleanup for PFVF[%d] [Command %08x]\n",

		   id, command);



	qed_wr(p_hwfn, p_ptt, XSDM_REG_OPERATION_GEN, command);

drivers/net/ethernet/qlogic/qlge/qlge_main.c

+2 −2
Original line number Diff line number Diff line
@@ -2211,7 +2211,7 @@ static int ql_clean_outbound_rx_ring(struct rx_ring *rx_ring) 
	while (prod != rx_ring->cnsmr_idx) {



		netif_printk(qdev, rx_status, KERN_DEBUG, qdev->ndev,

			     "cq_id = %d, prod = %d, cnsmr = %d.\n.",

			     "cq_id = %d, prod = %d, cnsmr = %d\n",

			     rx_ring->cq_id, prod, rx_ring->cnsmr_idx);



		net_rsp = (struct ob_mac_iocb_rsp *)rx_ring->curr_entry;
@@ -2258,7 +2258,7 @@ static int ql_clean_inbound_rx_ring(struct rx_ring *rx_ring, int budget) 
	while (prod != rx_ring->cnsmr_idx) {



		netif_printk(qdev, rx_status, KERN_DEBUG, qdev->ndev,

			     "cq_id = %d, prod = %d, cnsmr = %d.\n.",

			     "cq_id = %d, prod = %d, cnsmr = %d\n",

			     rx_ring->cq_id, prod, rx_ring->cnsmr_idx);



		net_rsp = rx_ring->curr_entry;

drivers/net/wireless/intel/ipw2x00/ipw2200.c

+1 −2
Original line number Diff line number Diff line
@@ -7557,8 +7557,7 @@ static int ipw_associate(void *data) 
	}



	if (priv->status & STATUS_DISASSOCIATING) {

		IPW_DEBUG_ASSOC("Not attempting association (in "

				"disassociating)\n ");

		IPW_DEBUG_ASSOC("Not attempting association (in disassociating)\n");

		schedule_work(&priv->associate);

		return 0;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE