@@ -1434,6 +1434,48 @@ static void axienet_dma_err_handler(unsigned long data)
}
/**
+ * axienet_dma_res_init - Initialize the DMA related resources of
+ * the axienet local structure.
+ * @lp: Pointer to axienet local structure
+ *
+ * Return: 0, on success
+ * Non-zero error value on failure.
+ *
+ * This function find the DMA node via pdev, map the DMA registers,
+ * and decode the DMA IRQs.
+ */
+static int axienet_dma_res_init(struct axienet_local *lp)
+{
+ struct resource dmares;
+ struct device_node *np;
+ int ret;
+
+ np = of_parse_phandle(lp->dev->of_node, "axistream-connected", 0);
+ if (!np) {
+ dev_err(lp->dev, "could not find DMA node\n");
+ ret = -ENODEV;
+ return ret;
+ }
+ ret = of_address_to_resource(np, 0, &dmares);
+ if (ret) {
+ dev_err(lp->dev, "unable to get DMA resource\n");
+ goto put_node;
+ }
+ lp->dma_regs = devm_ioremap_resource(lp->dev, &dmares);
+ if (IS_ERR(lp->dma_regs)) {
+ dev_err(lp->dev, "could not map DMA regs\n");
+ ret = PTR_ERR(lp->dma_regs);
+ goto put_node;
+ }
+ lp->rx_irq = irq_of_parse_and_map(np, 1);
+ lp->tx_irq = irq_of_parse_and_map(np, 0);
+
+put_node:
+ of_node_put(np);
+ return ret;
+}
+
+/**
* axienet_probe - Axi Ethernet probe function.
* @pdev: Pointer to platform device structure.
*
@@ -1448,11 +1490,10 @@ static void axienet_dma_err_handler(unsigned long data)
static int axienet_probe(struct platform_device *pdev)
{
int ret;
- struct device_node *np;
struct axienet_local *lp;
struct net_device *ndev;
const void *mac_addr;
- struct resource *ethres, dmares;
+ struct resource *ethres;
u32 value;
ndev = alloc_etherdev(sizeof(*lp));
@@ -1565,29 +1606,9 @@ static int axienet_probe(struct platform_device *pdev)
}
}
- /* Find the DMA node, map the DMA registers, and decode the DMA IRQs */
- np = of_parse_phandle(pdev->dev.of_node, "axistream-connected", 0);
- if (!np) {
- dev_err(&pdev->dev, "could not find DMA node\n");
- ret = -ENODEV;
- goto free_netdev;
- }
- ret = of_address_to_resource(np, 0, &dmares);
- if (ret) {
- dev_err(&pdev->dev, "unable to get DMA resource\n");
- of_node_put(np);
- goto free_netdev;
- }
- lp->dma_regs = devm_ioremap_resource(&pdev->dev, &dmares);
- if (IS_ERR(lp->dma_regs)) {
- dev_err(&pdev->dev, "could not map DMA regs\n");
- ret = PTR_ERR(lp->dma_regs);
- of_node_put(np);
+ ret = axienet_dma_res_init(lp);
+ if (ret)
goto free_netdev;
- }
- lp->rx_irq = irq_of_parse_and_map(np, 1);
- lp->tx_irq = irq_of_parse_and_map(np, 0);
- of_node_put(np);
if ((lp->rx_irq <= 0) || (lp->tx_irq <= 0)) {
dev_err(&pdev->dev, "could not determine irqs\n");
ret = -ENOMEM;
The "Find DMA Node, Map DMA Register, and Decode DMA IRQ" code snippets in Axienet_Probe are independent. Tidy up axienet_probe a little by factoring these out into a helper function. Signed-off-by: Wen Yang <wen.yang99@zte.com.cn> Reported-by: Markus Elfring <Markus.Elfring@web.de> Cc: Anirudha Sarangi <anirudh@xilinx.com> Cc: John Linn <John.Linn@xilinx.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Michal Simek <michal.simek@xilinx.com> Cc: Markus Elfring <Markus.Elfring@web.de> Cc: netdev@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 69 +++++++++++++++-------- 1 file changed, 45 insertions(+), 24 deletions(-)