Commit b0377116 authored by Rob Herring's avatar Rob Herring Committed by David S. Miller
Browse files

net: ethernet: Use device_get_match_data() 



Use preferred device_get_match_data() instead of of_match_device() to
get the driver match data. With this, adjust the includes to explicitly
include the correct headers.

Signed-off-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4d177f49

drivers/net/ethernet/altera/altera_tse.h

+1 −1
Original line number Diff line number Diff line
@@ -472,7 +472,7 @@ struct altera_tse_private { 
	/* ethtool msglvl option */

	u32 msg_enable;



	struct altera_dmaops *dmaops;

	const struct altera_dmaops *dmaops;



	struct phylink *phylink;

	struct phylink_config phylink_config;

drivers/net/ethernet/altera/altera_tse_main.c

+3 −10
Original line number Diff line number Diff line
@@ -29,13 +29,13 @@ 
#include <linux/mii.h>

#include <linux/mdio/mdio-regmap.h>

#include <linux/netdevice.h>

#include <linux/of_device.h>

#include <linux/of.h>

#include <linux/of_mdio.h>

#include <linux/of_net.h>

#include <linux/of_platform.h>

#include <linux/pcs-lynx.h>

#include <linux/phy.h>

#include <linux/platform_device.h>

#include <linux/property.h>

#include <linux/regmap.h>

#include <linux/skbuff.h>

#include <asm/cacheflush.h>
@@ -82,8 +82,6 @@ MODULE_PARM_DESC(dma_tx_num, "Number of descriptors in the TX list"); 


#define TXQUEUESTOP_THRESHHOLD	2



static const struct of_device_id altera_tse_ids[];



static inline u32 tse_tx_avail(struct altera_tse_private *priv)

{

	return priv->tx_cons + priv->tx_ring_size - priv->tx_prod - 1;
@@ -1133,7 +1131,6 @@ static int request_and_map(struct platform_device *pdev, const char *name, 
 */

static int altera_tse_probe(struct platform_device *pdev)

{

	const struct of_device_id *of_id = NULL;

	struct regmap_config pcs_regmap_cfg;

	struct altera_tse_private *priv;

	struct mdio_regmap_config mrc;
@@ -1159,11 +1156,7 @@ static int altera_tse_probe(struct platform_device *pdev) 
	priv->dev = ndev;

	priv->msg_enable = netif_msg_init(debug, default_msg_level);



	of_id = of_match_device(altera_tse_ids, &pdev->dev);



	if (of_id)

		priv->dmaops = (struct altera_dmaops *)of_id->data;



	priv->dmaops = device_get_match_data(&pdev->dev);



	if (priv->dmaops &&

	    priv->dmaops->altera_dtype == ALTERA_DTYPE_SGDMA) {

drivers/net/ethernet/amd/xgbe/xgbe-platform.c

+1 −41
Original line number Diff line number Diff line
@@ -123,9 +123,7 @@ 
#include <linux/io.h>

#include <linux/of.h>

#include <linux/of_net.h>

#include <linux/of_address.h>

#include <linux/of_platform.h>

#include <linux/of_device.h>

#include <linux/clk.h>

#include <linux/property.h>

#include <linux/acpi.h>
@@ -135,17 +133,6 @@ 
#include "xgbe-common.h"



#ifdef CONFIG_ACPI

static const struct acpi_device_id xgbe_acpi_match[];



static struct xgbe_version_data *xgbe_acpi_vdata(struct xgbe_prv_data *pdata)

{

	const struct acpi_device_id *id;



	id = acpi_match_device(xgbe_acpi_match, pdata->dev);



	return id ? (struct xgbe_version_data *)id->driver_data : NULL;

}



static int xgbe_acpi_support(struct xgbe_prv_data *pdata)

{

	struct device *dev = pdata->dev;
@@ -173,11 +160,6 @@ static int xgbe_acpi_support(struct xgbe_prv_data *pdata) 
	return 0;

}

#else   /* CONFIG_ACPI */

static struct xgbe_version_data *xgbe_acpi_vdata(struct xgbe_prv_data *pdata)

{

	return NULL;

}



static int xgbe_acpi_support(struct xgbe_prv_data *pdata)

{

	return -EINVAL;
@@ -185,17 +167,6 @@ static int xgbe_acpi_support(struct xgbe_prv_data *pdata) 
#endif  /* CONFIG_ACPI */



#ifdef CONFIG_OF

static const struct of_device_id xgbe_of_match[];



static struct xgbe_version_data *xgbe_of_vdata(struct xgbe_prv_data *pdata)

{

	const struct of_device_id *id;



	id = of_match_device(xgbe_of_match, pdata->dev);



	return id ? (struct xgbe_version_data *)id->data : NULL;

}



static int xgbe_of_support(struct xgbe_prv_data *pdata)

{

	struct device *dev = pdata->dev;
@@ -244,11 +215,6 @@ static struct platform_device *xgbe_of_get_phy_pdev(struct xgbe_prv_data *pdata) 
	return phy_pdev;

}

#else   /* CONFIG_OF */

static struct xgbe_version_data *xgbe_of_vdata(struct xgbe_prv_data *pdata)

{

	return NULL;

}



static int xgbe_of_support(struct xgbe_prv_data *pdata)

{

	return -EINVAL;
@@ -290,12 +256,6 @@ static struct platform_device *xgbe_get_phy_pdev(struct xgbe_prv_data *pdata) 
	return phy_pdev;

}



static struct xgbe_version_data *xgbe_get_vdata(struct xgbe_prv_data *pdata)

{

	return pdata->use_acpi ? xgbe_acpi_vdata(pdata)

			       : xgbe_of_vdata(pdata);

}



static int xgbe_platform_probe(struct platform_device *pdev)

{

	struct xgbe_prv_data *pdata;
@@ -321,7 +281,7 @@ static int xgbe_platform_probe(struct platform_device *pdev) 
	pdata->use_acpi = dev->of_node ? 0 : 1;



	/* Get the version data */

	pdata->vdata = xgbe_get_vdata(pdata);

	pdata->vdata = (struct xgbe_version_data *)device_get_match_data(dev);



	phy_pdev = xgbe_get_phy_pdev(pdata);

	if (!phy_pdev) {

drivers/net/ethernet/apm/xgene/xgene_enet_main.c

+1 −14
Original line number Diff line number Diff line
@@ -2018,7 +2018,6 @@ static int xgene_enet_probe(struct platform_device *pdev) 
	struct xgene_enet_pdata *pdata;

	struct device *dev = &pdev->dev;

	void (*link_state)(struct work_struct *);

	const struct of_device_id *of_id;

	int ret;



	ndev = alloc_etherdev_mqs(sizeof(struct xgene_enet_pdata),
@@ -2039,19 +2038,7 @@ static int xgene_enet_probe(struct platform_device *pdev) 
			  NETIF_F_GRO |

			  NETIF_F_SG;



	of_id = of_match_device(xgene_enet_of_match, &pdev->dev);

	if (of_id) {

		pdata->enet_id = (uintptr_t)of_id->data;

	}

#ifdef CONFIG_ACPI

	else {

		const struct acpi_device_id *acpi_id;



		acpi_id = acpi_match_device(xgene_enet_acpi_match, &pdev->dev);

		if (acpi_id)

			pdata->enet_id = (enum xgene_enet_id) acpi_id->driver_data;

	}

#endif

	pdata->enet_id = (enum xgene_enet_id)device_get_match_data(&pdev->dev);

	if (!pdata->enet_id) {

		ret = -ENODEV;

		goto err;

drivers/net/ethernet/apm/xgene/xgene_enet_main.h

+2 −1
Original line number Diff line number Diff line
@@ -15,9 +15,10 @@ 
#include <linux/efi.h>

#include <linux/irq.h>

#include <linux/io.h>

#include <linux/of_platform.h>

#include <linux/of.h>

#include <linux/of_net.h>

#include <linux/of_mdio.h>

#include <linux/platform_device.h>

#include <linux/mdio/mdio-xgene.h>

#include <linux/module.h>

#include <net/ip.h>