can: flexcan: convert the driver to DT-only (2c0ac920) · Commits · 戴 / test

drivers/net/can/flexcan.c

+1 −17

Original line number	Diff line number	Diff line
		@@ -1940,15 +1940,8 @@ static const struct of_device_id flexcan_of_match[] = {
		};
		MODULE_DEVICE_TABLE(of, flexcan_of_match);

		static const struct platform_device_id flexcan_id_table[] = {
		{ .name = "flexcan", .driver_data = (kernel_ulong_t)&fsl_p1010_devtype_data, },
		{ /* sentinel */ },
		};
		MODULE_DEVICE_TABLE(platform, flexcan_id_table);

		static int flexcan_probe(struct platform_device *pdev)
		{
		const struct of_device_id *of_id;
		const struct flexcan_devtype_data *devtype_data;
		struct net_device *dev;
		struct flexcan_priv *priv;
		@@ -1997,15 +1990,7 @@ static int flexcan_probe(struct platform_device *pdev)
		if (IS_ERR(regs))
		return PTR_ERR(regs);

		of_id = of_match_device(flexcan_of_match, &pdev->dev);
		if (of_id) {
		devtype_data = of_id->data;
		} else if (platform_get_device_id(pdev)->driver_data) {
		devtype_data = (struct flexcan_devtype_data *)
		platform_get_device_id(pdev)->driver_data;
		} else {
		return -ENODEV;
		}
		devtype_data = of_device_get_match_data(&pdev->dev);

		if ((devtype_data->quirks & FLEXCAN_QUIRK_SUPPORT_FD) &&
		!(devtype_data->quirks & FLEXCAN_QUIRK_USE_OFF_TIMESTAMP)) {
		@@ -2235,7 +2220,6 @@ static struct platform_driver flexcan_driver = {
		},
		.probe = flexcan_probe,
		.remove = flexcan_remove,
		.id_table = flexcan_id_table,
		};

		module_platform_driver(flexcan_driver);