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

Commit c3a502de authored by Andy Shevchenko's avatar Andy Shevchenko Committed by David S. Miller
Browse files

stmmac: platform: adjust messages and move to dev level 



This patch amends the error and warning messages across the platform driver.
It includes the following changes:
 - append \n to the end of messages
 - change pr_* macros to dev_*

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fe4a7a41

drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c

+13 −9
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 


/**

 * dwmac1000_validate_mcast_bins - validates the number of Multicast filter bins

 * @dev: struct device of the platform device

 * @mcast_bins: Multicast filtering bins

 * Description:

 * this function validates the number of Multicast filtering bins specified
@@ -33,7 +34,7 @@ 
 * invalid and will cause the filtering algorithm to use Multicast

 * promiscuous mode.

 */

static int dwmac1000_validate_mcast_bins(int mcast_bins)

static int dwmac1000_validate_mcast_bins(struct device *dev, int mcast_bins)

{

	int x = mcast_bins;
@@ -44,7 +45,7 @@ static int dwmac1000_validate_mcast_bins(int mcast_bins) 
		break;

	default:

		x = 0;

		pr_info("Hash table entries set to unexpected value %d",

		dev_info(dev, "Hash table entries set to unexpected value %d\n",

			 mcast_bins);

		break;

	}
@@ -53,6 +54,7 @@ static int dwmac1000_validate_mcast_bins(int mcast_bins) 


/**

 * dwmac1000_validate_ucast_entries - validate the Unicast address entries

 * @dev: struct device of the platform device

 * @ucast_entries: number of Unicast address entries

 * Description:

 * This function validates the number of Unicast address entries supported
@@ -62,7 +64,8 @@ static int dwmac1000_validate_mcast_bins(int mcast_bins) 
 * selected, and defaults to 1 Unicast address if an unsupported

 * configuration is selected.

 */

static int dwmac1000_validate_ucast_entries(int ucast_entries)

static int dwmac1000_validate_ucast_entries(struct device *dev,

					    int ucast_entries)

{

	int x = ucast_entries;
@@ -73,7 +76,7 @@ static int dwmac1000_validate_ucast_entries(int ucast_entries) 
		break;

	default:

		x = 1;

		pr_info("Unicast table entries set to unexpected value %d\n",

		dev_info(dev, "Unicast table entries set to unexpected value %d\n",

			 ucast_entries);

		break;

	}
@@ -463,9 +466,9 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac) 
		of_property_read_u32(np, "snps,perfect-filter-entries",

				     &plat->unicast_filter_entries);

		plat->unicast_filter_entries = dwmac1000_validate_ucast_entries(

					       plat->unicast_filter_entries);

				&pdev->dev, plat->unicast_filter_entries);

		plat->multicast_filter_bins = dwmac1000_validate_mcast_bins(

					      plat->multicast_filter_bins);

				&pdev->dev, plat->multicast_filter_bins);

		plat->has_gmac = 1;

		plat->pmt = 1;

	}
@@ -514,7 +517,8 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac) 
	plat->force_thresh_dma_mode = of_property_read_bool(np, "snps,force_thresh_dma_mode");

	if (plat->force_thresh_dma_mode) {

		plat->force_sf_dma_mode = 0;

		pr_warn("force_sf_dma_mode is ignored if force_thresh_dma_mode is set.");

		dev_warn(&pdev->dev,

			 "force_sf_dma_mode is ignored if force_thresh_dma_mode is set.\n");

	}



	of_property_read_u32(np, "snps,ps-speed", &plat->mac_port_sel_speed);