Skip to content

Commit 8da1a39

Browse files
Michal Simekgregkh
authored andcommitted
Revert "serial: uartps: Use the same dynamic major number for all ports"
This reverts commit ab26266. 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: Johan Hovold <[email protected]> Signed-off-by: Michal Simek <[email protected]> Cc: stable <[email protected]> Link: https://lore.kernel.org/r/14a565fc1e14a5ec6cc6a6710deb878ae8305f22.1585905873.git.michal.simek@xilinx.com Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 2e01911 commit 8da1a39

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

drivers/tty/serial/xilinx_uartps.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626

2727
#define CDNS_UART_TTY_NAME "ttyPS"
2828
#define CDNS_UART_NAME "xuartps"
29+
#define CDNS_UART_MAJOR 0 /* use dynamic node allocation */
2930
#define CDNS_UART_FIFO_SIZE 64 /* FIFO size */
3031
#define CDNS_UART_REGISTER_SPACE 0x1000
3132
#define TX_TIMEOUT 500000
3233

3334
/* Rx Trigger level */
3435
static int rx_trigger_level = 56;
35-
static int uartps_major;
3636
module_param(rx_trigger_level, uint, 0444);
3737
MODULE_PARM_DESC(rx_trigger_level, "Rx trigger level, 1-63 bytes");
3838

@@ -1535,7 +1535,7 @@ static int cdns_uart_probe(struct platform_device *pdev)
15351535
cdns_uart_uart_driver->owner = THIS_MODULE;
15361536
cdns_uart_uart_driver->driver_name = driver_name;
15371537
cdns_uart_uart_driver->dev_name = CDNS_UART_TTY_NAME;
1538-
cdns_uart_uart_driver->major = uartps_major;
1538+
cdns_uart_uart_driver->major = CDNS_UART_MAJOR;
15391539
cdns_uart_uart_driver->minor = cdns_uart_data->id;
15401540
cdns_uart_uart_driver->nr = 1;
15411541

@@ -1564,7 +1564,6 @@ static int cdns_uart_probe(struct platform_device *pdev)
15641564
goto err_out_id;
15651565
}
15661566

1567-
uartps_major = cdns_uart_uart_driver->tty_driver->major;
15681567
cdns_uart_data->cdns_uart_driver = cdns_uart_uart_driver;
15691568

15701569
/*

0 commit comments

Comments
 (0)