add wifi6 8852be driver

hc

2024-12-19 9370bb92b2d16684ee45cf24e879c93c509162da

 kernel/drivers/net/ethernet/amd/xgbe/xgbe-platform.c
..
..
@@ -301,7 +301,6 @@
301
301
 	struct xgbe_prv_data *pdata;
302
302
 	struct device *dev = &pdev->dev;
303
303
 	struct platform_device *phy_pdev;
304
-	struct resource *res;
305
304
 	const char *phy_mode;
306
305
 	unsigned int phy_memnum, phy_irqnum;
307
306
 	unsigned int dma_irqnum, dma_irqend;
..
..
@@ -353,8 +352,7 @@
353
352
 	}
354
353
 
355
354
 	/* Obtain the mmio areas for the device */
356
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
357
-	pdata->xgmac_regs = devm_ioremap_resource(dev, res);
355
+	pdata->xgmac_regs = devm_platform_ioremap_resource(pdev, 0);
358
356
 	if (IS_ERR(pdata->xgmac_regs)) {
359
357
 		dev_err(dev, "xgmac ioremap failed\n");
360
358
 		ret = PTR_ERR(pdata->xgmac_regs);
..
..
@@ -363,8 +361,7 @@
363
361
 	if (netif_msg_probe(pdata))
364
362
 		dev_dbg(dev, "xgmac_regs = %p\n", pdata->xgmac_regs);
365
363
 
366
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
367
-	pdata->xpcs_regs = devm_ioremap_resource(dev, res);
364
+	pdata->xpcs_regs = devm_platform_ioremap_resource(pdev, 1);
368
365
 	if (IS_ERR(pdata->xpcs_regs)) {
369
366
 		dev_err(dev, "xpcs ioremap failed\n");
370
367
 		ret = PTR_ERR(pdata->xpcs_regs);
..
..
@@ -373,8 +370,8 @@
373
370
 	if (netif_msg_probe(pdata))
374
371
 		dev_dbg(dev, "xpcs_regs  = %p\n", pdata->xpcs_regs);
375
372
 
376
-	res = platform_get_resource(phy_pdev, IORESOURCE_MEM, phy_memnum++);
377
-	pdata->rxtx_regs = devm_ioremap_resource(dev, res);
373
+	pdata->rxtx_regs = devm_platform_ioremap_resource(phy_pdev,
374
+							  phy_memnum++);
378
375
 	if (IS_ERR(pdata->rxtx_regs)) {
379
376
 		dev_err(dev, "rxtx ioremap failed\n");
380
377
 		ret = PTR_ERR(pdata->rxtx_regs);
..
..
@@ -383,8 +380,8 @@
383
380
 	if (netif_msg_probe(pdata))
384
381
 		dev_dbg(dev, "rxtx_regs  = %p\n", pdata->rxtx_regs);
385
382
 
386
-	res = platform_get_resource(phy_pdev, IORESOURCE_MEM, phy_memnum++);
387
-	pdata->sir0_regs = devm_ioremap_resource(dev, res);
383
+	pdata->sir0_regs = devm_platform_ioremap_resource(phy_pdev,
384
+							  phy_memnum++);
388
385
 	if (IS_ERR(pdata->sir0_regs)) {
389
386
 		dev_err(dev, "sir0 ioremap failed\n");
390
387
 		ret = PTR_ERR(pdata->sir0_regs);
..
..
@@ -393,8 +390,8 @@
393
390
 	if (netif_msg_probe(pdata))
394
391
 		dev_dbg(dev, "sir0_regs  = %p\n", pdata->sir0_regs);
395
392
 
396
-	res = platform_get_resource(phy_pdev, IORESOURCE_MEM, phy_memnum++);
397
-	pdata->sir1_regs = devm_ioremap_resource(dev, res);
393
+	pdata->sir1_regs = devm_platform_ioremap_resource(phy_pdev,
394
+							  phy_memnum++);
398
395
 	if (IS_ERR(pdata->sir1_regs)) {
399
396
 		dev_err(dev, "sir1 ioremap failed\n");
400
397
 		ret = PTR_ERR(pdata->sir1_regs);
..
..
@@ -467,10 +464,8 @@
467
464
 
468
465
 	/* Get the device interrupt */
469
466
 	ret = platform_get_irq(pdev, 0);
470
-	if (ret < 0) {
471
-		dev_err(dev, "platform_get_irq 0 failed\n");
467
+	if (ret < 0)
472
468
 		goto err_io;
473
-	}
474
469
 	pdata->dev_irq = ret;
475
470
 
476
471
 	/* Get the per channel DMA interrupts */
..
..
@@ -479,12 +474,8 @@
479
474
 
480
475
 		for (i = 0; (i < max) && (dma_irqnum < dma_irqend); i++) {
481
476
 			ret = platform_get_irq(pdata->platdev, dma_irqnum++);
482
-			if (ret < 0) {
483
-				netdev_err(pdata->netdev,
484
-					   "platform_get_irq %u failed\n",
485
-					   dma_irqnum - 1);
477
+			if (ret < 0)
486
478
 				goto err_io;
487
-			}
488
479
 
489
480
 			pdata->channel_irq[i] = ret;
490
481
 		}
..
..
@@ -496,10 +487,8 @@
496
487
 
497
488
 	/* Get the auto-negotiation interrupt */
498
489
 	ret = platform_get_irq(phy_pdev, phy_irqnum++);
499
-	if (ret < 0) {
500
-		dev_err(dev, "platform_get_irq phy 0 failed\n");
490
+	if (ret < 0)
501
491
 		goto err_io;
502
-	}
503
492
 	pdata->an_irq = ret;
504
493
 
505
494
 	/* Configure the netdev resource */