mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/fpga/xilinx-pr-decoupler.c
..
..
@@ -1,18 +1,10 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * Copyright (c) 2017, National Instruments Corp.
3
4
  * Copyright (c) 2017, Xilix Inc
4
5
  *
5
6
  * FPGA Bridge Driver for the Xilinx LogiCORE Partial Reconfiguration
6
7
  * Decoupler IP Core.
7
- *
8
- * This program is free software; you can redistribute it and/or modify
9
- * it under the terms of the GNU General Public License as published by
10
- * the Free Software Foundation; version 2 of the License.
11
- *
12
- * This program is distributed in the hope that it will be useful,
13
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
14
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15
- * GNU General Public License for more details.
16
8
  */
17
9
 
18
10
 #include <linux/clk.h>
..
..
@@ -109,7 +101,8 @@
109
101
 
110
102
 	priv->clk = devm_clk_get(&pdev->dev, "aclk");
111
103
 	if (IS_ERR(priv->clk)) {
112
-		dev_err(&pdev->dev, "input clock not found\n");
104
+		if (PTR_ERR(priv->clk) != -EPROBE_DEFER)
105
+			dev_err(&pdev->dev, "input clock not found\n");
113
106
 		return PTR_ERR(priv->clk);
114
107
 	}
115
108
 
..
..
@@ -121,8 +114,8 @@
121
114
 
122
115
 	clk_disable(priv->clk);
123
116
 
124
-	br = fpga_bridge_create(&pdev->dev, "Xilinx PR Decoupler",
125
-				&xlnx_pr_decoupler_br_ops, priv);
117
+	br = devm_fpga_bridge_create(&pdev->dev, "Xilinx PR Decoupler",
118
+				     &xlnx_pr_decoupler_br_ops, priv);
126
119
 	if (!br) {
127
120
 		err = -ENOMEM;
128
121
 		goto err_clk;