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

Commit 84b1f153 authored by Roland Dreier's avatar Roland Dreier
Browse files

mlx4_core: Trivial cleanups to driver log messages 



Also put format string onto one line.

Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
parent 69612b9f

drivers/net/ethernet/mellanox/mlx4/main.c

+4 −5
Original line number Original line Diff line number Diff line
@@ -2036,12 +2036,11 @@ static int __mlx4_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
		}

		}





		if (num_vfs) {

		if (num_vfs) {

			mlx4_warn(dev, "Enabling sriov with:%d vfs\n", num_vfs);

			mlx4_warn(dev, "Enabling SR-IOV with %d VFs\n", num_vfs);

			err = pci_enable_sriov(pdev, num_vfs);

			err = pci_enable_sriov(pdev, num_vfs);

			if (err) {

			if (err) {

				mlx4_err(dev, "Failed to enable sriov,"

				mlx4_err(dev, "Failed to enable SR-IOV, continuing without SR-IOV (err = %d).\n",

					 "continuing without sriov enabled"

					 err);

					 " (err = %d).\n", err);

				err = 0;

				err = 0;

			} else {

			} else {

				mlx4_warn(dev, "Running in master mode\n");

				mlx4_warn(dev, "Running in master mode\n");
@@ -2284,7 +2283,7 @@ static void mlx4_remove_one(struct pci_dev *pdev) 
		if (dev->flags & MLX4_FLAG_MSI_X)

		if (dev->flags & MLX4_FLAG_MSI_X)

			pci_disable_msix(pdev);

			pci_disable_msix(pdev);

		if (dev->flags & MLX4_FLAG_SRIOV) {

		if (dev->flags & MLX4_FLAG_SRIOV) {

			mlx4_warn(dev, "Disabling sriov\n");

			mlx4_warn(dev, "Disabling SR-IOV\n");

			pci_disable_sriov(pdev);

			pci_disable_sriov(pdev);

		}

		}