Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'net-fec-fix-device_get_match_data-usage'
Alexander Stein says:
====================
net: fec: Fix device_get_match_data usage
this is v2 adressing the regression introduced by commit b0377116decd
("net: ethernet: Use device_get_match_data()").
You could also remove the (!dev_info) case for Coldfire as this platform
has no quirks. But IMHO this should be kept as long as Coldfire platform
data is supported.
====================
Link: https://lore.kernel.org/r/20231017063419.925266-1-alexander.stein@ew.tq-group.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+10
-53
+10
-53
drivers/net/ethernet/freescale/fec_main.c
+10
-53
drivers/net/ethernet/freescale/fec_main.c
···
187
187
.name = DRIVER_NAME,
188
188
.driver_data = 0,
189
189
}, {
190
-
.name = "imx25-fec",
191
-
.driver_data = (kernel_ulong_t)&fec_imx25_info,
192
-
}, {
193
-
.name = "imx27-fec",
194
-
.driver_data = (kernel_ulong_t)&fec_imx27_info,
195
-
}, {
196
-
.name = "imx28-fec",
197
-
.driver_data = (kernel_ulong_t)&fec_imx28_info,
198
-
}, {
199
-
.name = "imx6q-fec",
200
-
.driver_data = (kernel_ulong_t)&fec_imx6q_info,
201
-
}, {
202
-
.name = "mvf600-fec",
203
-
.driver_data = (kernel_ulong_t)&fec_mvf600_info,
204
-
}, {
205
-
.name = "imx6sx-fec",
206
-
.driver_data = (kernel_ulong_t)&fec_imx6x_info,
207
-
}, {
208
-
.name = "imx6ul-fec",
209
-
.driver_data = (kernel_ulong_t)&fec_imx6ul_info,
210
-
}, {
211
-
.name = "imx8mq-fec",
212
-
.driver_data = (kernel_ulong_t)&fec_imx8mq_info,
213
-
}, {
214
-
.name = "imx8qm-fec",
215
-
.driver_data = (kernel_ulong_t)&fec_imx8qm_info,
216
-
}, {
217
-
.name = "s32v234-fec",
218
-
.driver_data = (kernel_ulong_t)&fec_s32v234_info,
219
-
}, {
220
190
/* sentinel */
221
191
}
222
192
};
223
193
MODULE_DEVICE_TABLE(platform, fec_devtype);
224
194
225
-
enum imx_fec_type {
226
-
IMX25_FEC = 1, /* runs on i.mx25/50/53 */
227
-
IMX27_FEC, /* runs on i.mx27/35/51 */
228
-
IMX28_FEC,
229
-
IMX6Q_FEC,
230
-
MVF600_FEC,
231
-
IMX6SX_FEC,
232
-
IMX6UL_FEC,
233
-
IMX8MQ_FEC,
234
-
IMX8QM_FEC,
235
-
S32V234_FEC,
236
-
};
237
-
238
195
static const struct of_device_id fec_dt_ids[] = {
239
-
{ .compatible = "fsl,imx25-fec", .data = &fec_devtype[IMX25_FEC], },
240
-
{ .compatible = "fsl,imx27-fec", .data = &fec_devtype[IMX27_FEC], },
241
-
{ .compatible = "fsl,imx28-fec", .data = &fec_devtype[IMX28_FEC], },
242
-
{ .compatible = "fsl,imx6q-fec", .data = &fec_devtype[IMX6Q_FEC], },
243
-
{ .compatible = "fsl,mvf600-fec", .data = &fec_devtype[MVF600_FEC], },
244
-
{ .compatible = "fsl,imx6sx-fec", .data = &fec_devtype[IMX6SX_FEC], },
245
-
{ .compatible = "fsl,imx6ul-fec", .data = &fec_devtype[IMX6UL_FEC], },
246
-
{ .compatible = "fsl,imx8mq-fec", .data = &fec_devtype[IMX8MQ_FEC], },
247
-
{ .compatible = "fsl,imx8qm-fec", .data = &fec_devtype[IMX8QM_FEC], },
248
-
{ .compatible = "fsl,s32v234-fec", .data = &fec_devtype[S32V234_FEC], },
196
+
{ .compatible = "fsl,imx25-fec", .data = &fec_imx25_info, },
197
+
{ .compatible = "fsl,imx27-fec", .data = &fec_imx27_info, },
198
+
{ .compatible = "fsl,imx28-fec", .data = &fec_imx28_info, },
199
+
{ .compatible = "fsl,imx6q-fec", .data = &fec_imx6q_info, },
200
+
{ .compatible = "fsl,mvf600-fec", .data = &fec_mvf600_info, },
201
+
{ .compatible = "fsl,imx6sx-fec", .data = &fec_imx6x_info, },
202
+
{ .compatible = "fsl,imx6ul-fec", .data = &fec_imx6ul_info, },
203
+
{ .compatible = "fsl,imx8mq-fec", .data = &fec_imx8mq_info, },
204
+
{ .compatible = "fsl,imx8qm-fec", .data = &fec_imx8qm_info, },
205
+
{ .compatible = "fsl,s32v234-fec", .data = &fec_s32v234_info, },
249
206
{ /* sentinel */ }
250
207
};
251
208
MODULE_DEVICE_TABLE(of, fec_dt_ids);