]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
net: stmmac: dwc-qos: use generic device api
authorAjay Gupta <ajayg@nvidia.com>
Mon, 16 Dec 2019 06:14:51 +0000 (22:14 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 17 Dec 2019 21:55:23 +0000 (13:55 -0800)
Use generic device api so that driver can work both with DT
or ACPI based devices.

Signed-off-by: Ajay Gupta <ajayg@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c

index dd9967aeda22113bbf06d154c5dc1af3963cbda9..f87306b3cdae80b50a2857006dd43d62a28e863e 100644 (file)
@@ -40,7 +40,7 @@ struct tegra_eqos {
 static int dwc_eth_dwmac_config_dt(struct platform_device *pdev,
                                   struct plat_stmmacenet_data *plat_dat)
 {
-       struct device_node *np = pdev->dev.of_node;
+       struct device *dev = &pdev->dev;
        u32 burst_map = 0;
        u32 bit_index = 0;
        u32 a_index = 0;
@@ -52,9 +52,10 @@ static int dwc_eth_dwmac_config_dt(struct platform_device *pdev,
                        return -ENOMEM;
        }
 
-       plat_dat->axi->axi_lpi_en = of_property_read_bool(np, "snps,en-lpi");
-       if (of_property_read_u32(np, "snps,write-requests",
-                                &plat_dat->axi->axi_wr_osr_lmt)) {
+       plat_dat->axi->axi_lpi_en = device_property_read_bool(dev,
+                                                             "snps,en-lpi");
+       if (device_property_read_u32(dev, "snps,write-requests",
+                                    &plat_dat->axi->axi_wr_osr_lmt)) {
                /**
                 * Since the register has a reset value of 1, if property
                 * is missing, default to 1.
@@ -68,8 +69,8 @@ static int dwc_eth_dwmac_config_dt(struct platform_device *pdev,
                plat_dat->axi->axi_wr_osr_lmt--;
        }
 
-       if (of_property_read_u32(np, "snps,read-requests",
-                                &plat_dat->axi->axi_rd_osr_lmt)) {
+       if (device_property_read_u32(dev, "snps,read-requests",
+                                    &plat_dat->axi->axi_rd_osr_lmt)) {
                /**
                 * Since the register has a reset value of 1, if property
                 * is missing, default to 1.
@@ -82,7 +83,7 @@ static int dwc_eth_dwmac_config_dt(struct platform_device *pdev,
                 */
                plat_dat->axi->axi_rd_osr_lmt--;
        }
-       of_property_read_u32(np, "snps,burst-map", &burst_map);
+       device_property_read_u32(dev, "snps,burst-map", &burst_map);
 
        /* converts burst-map bitmask to burst array */
        for (bit_index = 0; bit_index < 7; bit_index++) {
@@ -421,7 +422,7 @@ static int dwc_eth_dwmac_probe(struct platform_device *pdev)
        void *priv;
        int ret;
 
-       data = of_device_get_match_data(&pdev->dev);
+       data = device_get_match_data(&pdev->dev);
 
        memset(&stmmac_res, 0, sizeof(struct stmmac_resources));
 
@@ -478,7 +479,7 @@ static int dwc_eth_dwmac_remove(struct platform_device *pdev)
        const struct dwc_eth_dwmac_data *data;
        int err;
 
-       data = of_device_get_match_data(&pdev->dev);
+       data = device_get_match_data(&pdev->dev);
 
        err = stmmac_dvr_remove(&pdev->dev);
        if (err < 0)