change wifi driver to cypress

hc

2024-01-05 071106ecf68c401173c58808b1cf5f68cc50d390

 kernel/drivers/gpu/drm/msm/edp/edp.c
..
..
@@ -1,14 +1,6 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.
3
- *
4
- * This program is free software; you can redistribute it and/or modify
5
- * it under the terms of the GNU General Public License version 2 and
6
- * only version 2 as published by the Free Software Foundation.
7
- *
8
- * This program is distributed in the hope that it will be useful,
9
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
10
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
- * GNU General Public License for more details.
12
4
  */
13
5
 
14
6
 #include <linux/of_irq.h>
..
..
@@ -157,7 +149,7 @@
157
149
 	edp->bridge = msm_edp_bridge_init(edp);
158
150
 	if (IS_ERR(edp->bridge)) {
159
151
 		ret = PTR_ERR(edp->bridge);
160
-		dev_err(dev->dev, "failed to create eDP bridge: %d\n", ret);
152
+		DRM_DEV_ERROR(dev->dev, "failed to create eDP bridge: %d\n", ret);
161
153
 		edp->bridge = NULL;
162
154
 		goto fail;
163
155
 	}
..
..
@@ -165,7 +157,7 @@
165
157
 	edp->connector = msm_edp_connector_init(edp);
166
158
 	if (IS_ERR(edp->connector)) {
167
159
 		ret = PTR_ERR(edp->connector);
168
-		dev_err(dev->dev, "failed to create eDP connector: %d\n", ret);
160
+		DRM_DEV_ERROR(dev->dev, "failed to create eDP connector: %d\n", ret);
169
161
 		edp->connector = NULL;
170
162
 		goto fail;
171
163
 	}
..
..
@@ -173,7 +165,7 @@
173
165
 	edp->irq = irq_of_parse_and_map(pdev->dev.of_node, 0);
174
166
 	if (edp->irq < 0) {
175
167
 		ret = edp->irq;
176
-		dev_err(dev->dev, "failed to get IRQ: %d\n", ret);
168
+		DRM_DEV_ERROR(dev->dev, "failed to get IRQ: %d\n", ret);
177
169
 		goto fail;
178
170
 	}
179
171
 
..
..
@@ -181,12 +173,10 @@
181
173
 			edp_irq, IRQF_TRIGGER_HIGH | IRQF_ONESHOT,
182
174
 			"edp_isr", edp);
183
175
 	if (ret < 0) {
184
-		dev_err(dev->dev, "failed to request IRQ%u: %d\n",
176
+		DRM_DEV_ERROR(dev->dev, "failed to request IRQ%u: %d\n",
185
177
 				edp->irq, ret);
186
178
 		goto fail;
187
179
 	}
188
-
189
-	encoder->bridge = edp->bridge;
190
180
 
191
181
 	priv->bridges[priv->num_bridges++]       = edp->bridge;
192
182
 	priv->connectors[priv->num_connectors++] = edp->connector;