Commit 4dec5f1a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

tty: serial: pch_uart.c: remove debugfs dentry pointer 

No need to keep around the dentry pointer for the debugfs file if all it
is used for is to remove it when we are wanting to clean up, as the
pointer can be looked up directly from debugfs instead.

This also removes pointless #ifdef CONFIG_DEBUG_FS brackets as the
compiler is smart enough to handle this properly if debugfs is disabled
without us having to worry about it.

Cc: Jiri Slaby <jirislaby@kernel.org>
Cc: linux-serial@vger.kernel.org
Link: https://lore.kernel.org/r/20210216145900.3835160-1-gregkh@linuxfoundation.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a38fd874

drivers/tty/serial/pch_uart.c

+7 −12
Original line number Diff line number Diff line
@@ -236,7 +236,6 @@ struct eg20t_port { 
	void				*rx_buf_virt;

	dma_addr_t			rx_buf_dma;



	struct dentry	*debugfs;

#define IRQ_NAME_SIZE 17

	char				irq_name[IRQ_NAME_SIZE];
@@ -1735,9 +1734,7 @@ static struct eg20t_port *pch_uart_init_port(struct pci_dev *pdev, 
	int fifosize;

	int port_type;

	struct pch_uart_driver_data *board;

#ifdef CONFIG_DEBUG_FS

	char name[32];	/* for debugfs file name */

#endif

	char name[32];



	board = &drv_dat[id->driver_data];

	port_type = board->port_type;
@@ -1813,11 +1810,9 @@ static struct eg20t_port *pch_uart_init_port(struct pci_dev *pdev, 
	if (ret < 0)

		goto init_port_hal_free;



#ifdef CONFIG_DEBUG_FS

	snprintf(name, sizeof(name), "uart%d_regs", board->line_no);

	priv->debugfs = debugfs_create_file(name, S_IFREG | S_IRUGO,

				NULL, priv, &port_regs_ops);

#endif

	snprintf(name, sizeof(name), "uart%d_regs", priv->port.line);

	debugfs_create_file(name, S_IFREG | S_IRUGO, NULL, priv,

			    &port_regs_ops);



	return priv;
@@ -1835,10 +1830,10 @@ static struct eg20t_port *pch_uart_init_port(struct pci_dev *pdev, 


static void pch_uart_exit_port(struct eg20t_port *priv)

{

	char name[32];



#ifdef CONFIG_DEBUG_FS

	debugfs_remove(priv->debugfs);

#endif

	snprintf(name, sizeof(name), "uart%d_regs", priv->port.line);

	debugfs_remove(debugfs_lookup(name, NULL));

	uart_remove_one_port(&pch_uart_driver, &priv->port);

	free_page((unsigned long)priv->rxbuf.buf);

}