Revert "serial: uartps: Fix uartps_major handling" (2e01911b) · Commits · 戴 / test

This reverts commit . As Johan says, this driver needs a lot more work and these changes are only going in the wrong direction: https://lkml.kernel.org/r/20190523091839.GC568@localhost Reported-by:

drivers/tty/serial/xilinx_uartps.c

+1 −7

Original line number	Diff line number	Diff line
		@@ -1564,6 +1564,7 @@ static int cdns_uart_probe(struct platform_device *pdev)
		goto err_out_id;
		}

		uartps_major = cdns_uart_uart_driver->tty_driver->major;
		cdns_uart_data->cdns_uart_driver = cdns_uart_uart_driver;

		/*
		@@ -1694,7 +1695,6 @@ static int cdns_uart_probe(struct platform_device *pdev)
		console_port = NULL;
		#endif

		uartps_major = cdns_uart_uart_driver->tty_driver->major;
		cdns_uart_data->cts_override = of_property_read_bool(pdev->dev.of_node,
		"cts-override");
		return 0;
		@@ -1756,12 +1756,6 @@ static int cdns_uart_remove(struct platform_device *pdev)
		console_port = NULL;
		#endif

		/* If this is last instance major number should be initialized */
		mutex_lock(&bitmap_lock);
		if (bitmap_empty(bitmap, MAX_UART_INSTANCES))
		uartps_major = 0;
		mutex_unlock(&bitmap_lock);

		uart_unregister_driver(cdns_uart_data->cdns_uart_driver);
		return rc;
		}