hc
2024-01-31 f9004dbfff8a3fbbd7e2a88c8a4327c7f2f8e5b2
kernel/drivers/input/keyboard/imx_keypad.c
....@@ -422,7 +422,6 @@
422422 dev_get_platdata(&pdev->dev);
423423 struct imx_keypad *keypad;
424424 struct input_dev *input_dev;
425
- struct resource *res;
426425 int irq, error, i, row, col;
427426
428427 if (!keymap_data && !pdev->dev.of_node) {
....@@ -431,10 +430,8 @@
431430 }
432431
433432 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)
436434 return irq;
437
- }
438435
439436 input_dev = devm_input_allocate_device(&pdev->dev);
440437 if (!input_dev) {
....@@ -455,8 +452,7 @@
455452 timer_setup(&keypad->check_matrix_timer,
456453 imx_keypad_check_for_events, 0);
457454
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);
460456 if (IS_ERR(keypad->mmio_base))
461457 return PTR_ERR(keypad->mmio_base);
462458