Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1260aa49 authored Oct 20, 2021 by Erik Ekman Committed by Greg Kroah-Hartman Nov 26, 2021

sfc: Don't use netif_info before net_device setup



[ Upstream commit bf6abf345dfa77786aca554bc58c64bd428ecb1d ]

Use pci_info instead to avoid unnamed/uninitialized noise:

[197088.688729] sfc 0000:01:00.0: Solarflare NIC detected
[197088.690333] sfc 0000:01:00.0: Part Number : SFN5122F
[197088.729061] sfc 0000:01:00.0 (unnamed net_device) (uninitialized): no SR-IOV VFs probed
[197088.729071] sfc 0000:01:00.0 (unnamed net_device) (uninitialized): no PTP support

Inspired by fa44821a4ddd ("sfc: don't use netif_info et al before
net_device is registered") from Heiner Kallweit.

Signed-off-by: Erik Ekman <erik@kryo.se>
Acked-by: Martin Habets <habetsm.xilinx@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 7509c60b

drivers/net/ethernet/sfc/ptp.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -651,7 +651,7 @@ static int efx_ptp_get_attributes(struct efx_nic *efx)
		} else if (rc == -EINVAL) {
		fmt = MC_CMD_PTP_OUT_GET_ATTRIBUTES_SECONDS_NANOSECONDS;
		} else if (rc == -EPERM) {
		netif_info(efx, probe, efx->net_dev, "no PTP support\n");
		pci_info(efx->pci_dev, "no PTP support\n");
		return rc;
		} else {
		efx_mcdi_display_error(efx, MC_CMD_PTP, sizeof(inbuf),
		@@ -827,7 +827,7 @@ static int efx_ptp_disable(struct efx_nic *efx)
		* should only have been called during probe.
		*/
		if (rc == -ENOSYS \|\| rc == -EPERM)
		netif_info(efx, probe, efx->net_dev, "no PTP support\n");
		pci_info(efx->pci_dev, "no PTP support\n");
		else if (rc)
		efx_mcdi_display_error(efx, MC_CMD_PTP,
		MC_CMD_PTP_IN_DISABLE_LEN,

drivers/net/ethernet/sfc/siena_sriov.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1059,7 +1059,7 @@ void efx_siena_sriov_probe(struct efx_nic *efx)
		return;

		if (efx_siena_sriov_cmd(efx, false, &efx->vi_scale, &count)) {
		netif_info(efx, probe, efx->net_dev, "no SR-IOV VFs probed\n");
		pci_info(efx->pci_dev, "no SR-IOV VFs probed\n");
		return;
		}
		if (count > 0 && count > max_vfs)