gmac get mac form eeprom

hc

2024-05-10 37f49e37ab4cb5d0bc4c60eb5c6d4dd57db767bb

 kernel/drivers/input/keyboard/imx_keypad.c
..
..
@@ -422,7 +422,6 @@
422
422
 			dev_get_platdata(&pdev->dev);
423
423
 	struct imx_keypad *keypad;
424
424
 	struct input_dev *input_dev;
425
-	struct resource *res;
426
425
 	int irq, error, i, row, col;
427
426
 
428
427
 	if (!keymap_data && !pdev->dev.of_node) {
..
..
@@ -431,10 +430,8 @@
431
430
 	}
432
431
 
433
432
 	irq = platform_get_irq(pdev, 0);
434
-	if (irq < 0) {
435
-		dev_err(&pdev->dev, "no irq defined in platform data\n");
433
+	if (irq < 0)
436
434
 		return irq;
437
-	}
438
435
 
439
436
 	input_dev = devm_input_allocate_device(&pdev->dev);
440
437
 	if (!input_dev) {
..
..
@@ -455,8 +452,7 @@
455
452
 	timer_setup(&keypad->check_matrix_timer,
456
453
 		    imx_keypad_check_for_events, 0);
457
454
 
458
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
459
-	keypad->mmio_base = devm_ioremap_resource(&pdev->dev, res);
455
+	keypad->mmio_base = devm_platform_ioremap_resource(pdev, 0);
460
456
 	if (IS_ERR(keypad->mmio_base))
461
457
 		return PTR_ERR(keypad->mmio_base);
462
458