disable FB

hc

2024-01-04 1543e317f1da31b75942316931e8f491a8920811

 kernel/drivers/pinctrl/mvebu/pinctrl-mvebu.c
..
..
@@ -1,13 +1,9 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /*
2
3
  * Marvell MVEBU pinctrl core driver
3
4
  *
4
5
  * Authors: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
5
6
  *          Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
6
- *
7
- * This program is free software; you can redistribute it and/or modify
8
- * it under the terms of the GNU General Public License as published by
9
- * the Free Software Foundation; either version 2 of the License, or
10
- * (at your option) any later version.
11
7
  */
12
8
 
13
9
 #include <linux/platform_device.h>
..
..
@@ -17,7 +13,7 @@
17
13
 #include <linux/of_address.h>
18
14
 #include <linux/of_platform.h>
19
15
 #include <linux/err.h>
20
-#include <linux/gpio.h>
16
+#include <linux/gpio/driver.h>
21
17
 #include <linux/pinctrl/machine.h>
22
18
 #include <linux/pinctrl/pinconf.h>
23
19
 #include <linux/pinctrl/pinctrl.h>
..
..
@@ -413,14 +409,14 @@
413
409
 	ret = of_property_read_string(np, "marvell,function", &function);
414
410
 	if (ret) {
415
411
 		dev_err(pctl->dev,
416
-			"missing marvell,function in node %s\n", np->name);
412
+			"missing marvell,function in node %pOFn\n", np);
417
413
 		return 0;
418
414
 	}
419
415
 
420
416
 	nmaps = of_property_count_strings(np, "marvell,pins");
421
417
 	if (nmaps < 0) {
422
418
 		dev_err(pctl->dev,
423
-			"missing marvell,pins in node %s\n", np->name);
419
+			"missing marvell,pins in node %pOFn\n", np);
424
420
 		return 0;
425
421
 	}
426
422
 
..
..
@@ -763,12 +759,10 @@
763
759
 {
764
760
 	struct mvebu_pinctrl_soc_info *soc = dev_get_platdata(&pdev->dev);
765
761
 	struct mvebu_mpp_ctrl_data *mpp_data;
766
-	struct resource *res;
767
762
 	void __iomem *base;
768
763
 	int i;
769
764
 
770
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
771
-	base = devm_ioremap_resource(&pdev->dev, res);
765
+	base = devm_platform_ioremap_resource(pdev, 0);
772
766
 	if (IS_ERR(base))
773
767
 		return PTR_ERR(base);
774
768