tty: serial: qcom_geni_serial: IRQ cleanup
Subsystems (2)
PATCH v3 1/2 tty: serial: qcom_geni_serial: IRQ cleanup
Move ISR registration from startup to probe function to avoid registering it everytime when the port open is called for driver.
---
Changes in v3:
- Address review comments on v2 patch.
- Using devm_kasprintf instead of scnprintf API.
drivers/tty/serial/qcom_geni_serial.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-)
drivers/tty/serial/qcom_geni_serial.c +19 -11
@@ -9,6 +9,7 @@#include <linux/console.h> #include <linux/io.h> #include <linux/iopoll.h> +#include <linux/irq.h> #include <linux/module.h> #include <linux/of.h> #include <linux/of_device.h>
@@ -101,7 +102,7 @@struct qcom_geni_serial_port {struct uart_port uport;struct geni_se se; -char name[20 ]; +const char *name;u32 tx_fifo_depth;u32 tx_fifo_width;u32 rx_fifo_depth;
@@ -830,7 +831,7 @@ static void qcom_geni_serial_shutdown(struct uart_port *uport)if (uart_console (uport))console_stop (uport->cons); -free_irq (uport->irq, uport); +disable_irq (uport->irq);spin_lock_irqsave (&uport->lock, flags);qcom_geni_serial_stop_tx (uport);qcom_geni_serial_stop_rx (uport);
@@ -890,21 +891,14 @@ static int qcom_geni_serial_startup(struct uart_port *uport)int ret;struct qcom_geni_serial_port *port =to_dev_port (uport, uport); -scnprintf (port->name,sizeof (port->name), -"qcom_serial_%s%d" , - (uart_console (uport) ?"console" :"uart" ), uport->line); -if (!port->setup) { ret =qcom_geni_serial_port_setup (uport);if (ret)return ret; } +enable_irq (uport->irq); - ret =request_irq (uport->irq, qcom_geni_serial_isr,IRQF_TRIGGER_HIGH , - port->name, uport); -if (ret) -dev_err (uport->dev,"Failed to get IRQ ret %d\n" , ret); -return ret; +return 0 ; }static unsigned long get_clk_cfg (unsigned long clk_freq)
@@ -1297,11 +1291,25 @@ static int qcom_geni_serial_probe(struct platform_device *pdev) port->rx_fifo_depth =DEF_FIFO_DEPTH_WORDS ; port->tx_fifo_width =DEF_FIFO_WIDTH_BITS ; + port->name =devm_kasprintf (uport->dev,GFP_KERNEL , +"qcom_geni_serial_%s%d" , +uart_console (uport) ?"console" :"uart" , uport->line); +if (!port->name) +return ERR_PTR (-ENOMEM ); + irq =platform_get_irq (pdev,0 );if (irq <0 )return irq; uport->irq = irq; +irq_set_status_flags (uport->irq,IRQ_NOAUTOEN ); + ret =devm_request_irq (uport->dev, uport->irq, qcom_geni_serial_isr, +IRQF_TRIGGER_HIGH , port->name, uport); +if (ret) { +dev_err (uport->dev,"Failed to get IRQ ret %d\n" , ret); +return ret; + } + uport->private_data = drv;platform_set_drvdata (pdev, port); port->handle_rx = console ? handle_rx_console : handle_rx_uart;
Signature · 1 line
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\na Linux Foundation Collaborative Project
Greg KH
maintainerQuoted 67 lines · Akash Asthana
Move ISR registration from startup to probe function to avoid registering it everytime when the port open is called for driver.
Signed-off-by Akash Asthana <[email protected]>---
Changes in v3:
- Address review comments on v2 patch.
- Usingdevm_kasprintfinstead of scnprintf API.drivers/tty/serial/qcom_geni_serial.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-)drivers/tty/serial/qcom_geni_serial.c +5
-11@@ -9,6 +9,7 @@#include <linux/console.h> #include <linux/io.h> #include <linux/iopoll.h> +#include <linux/irq.h> #include <linux/module.h> #include <linux/of.h> #include <linux/of_device.h> @@ -101,7 +102,7 @@struct qcom_geni_serial_port {struct uart_port uport;struct geni_se se; -char name[20 ]; +const char *name;u32 tx_fifo_depth;u32 tx_fifo_width;u32 rx_fifo_depth;@@ -830,7 +831,7 @@ static void qcom_geni_serial_shutdown(struct uart_port *uport)if (uart_console (uport))console_stop (uport->cons); -free_irq (uport->irq, uport); +disable_irq (uport->irq);spin_lock_irqsave (&uport->lock, flags);qcom_geni_serial_stop_tx (uport);qcom_geni_serial_stop_rx (uport);@@ -890,21 +891,14 @@ static int qcom_geni_serial_startup(struct uart_port *uport)int ret;struct qcom_geni_serial_port *port =to_dev_port (uport, uport); -scnprintf (port->name,sizeof (port->name), -"qcom_serial_%s%d" , - (uart_console (uport) ?"console" :"uart" ), uport->line); -if (!port->setup) { ret =qcom_geni_serial_port_setup (uport);if (ret)return ret; } +enable_irq (uport->irq); - ret =request_irq (uport->irq, qcom_geni_serial_isr,IRQF_TRIGGER_HIGH , - port->name, uport); -if (ret) -dev_err (uport->dev,"Failed to get IRQ ret %d\n" , ret); -return ret; +return 0 ; }static unsigned long get_clk_cfg (unsigned long clk_freq)
drivers/tty/serial/qcom_geni_serial.c static int qcom_geni_serial_probe(struct platform_device *pdev) · line 1298
Quoted 8 lines
drivers/tty/serial/qcom_geni_serial.c +5
-0@@ -1297,11 +1291,25 @@ static int qcom_geni_serial_probe(struct platform_device *pdev) port->rx_fifo_depth =DEF_FIFO_DEPTH_WORDS ; port->tx_fifo_width =DEF_FIFO_WIDTH_BITS ; + port->name =devm_kasprintf (uport->dev,GFP_KERNEL , +"qcom_geni_serial_%s%d" , +uart_console (uport) ?"console" :"uart" , uport->line); +if (!port->name) +return ERR_PTR (-ENOMEM );
Why are you returning a pointer when the return type of this function is int? Did the compiler not complain? Shouldn't this just be -ENOMEM?
drivers/tty/serial/qcom_geni_serial.c static int qcom_geni_serial_probe(struct platform_device *pdev) · line 1309
Quoted 11 lines
drivers/tty/serial/qcom_geni_serial.c +6
-0+ irq =platform_get_irq (pdev,0 );if (irq <0 )return irq; uport->irq = irq; +irq_set_status_flags (uport->irq,IRQ_NOAUTOEN ); + ret =devm_request_irq (uport->dev, uport->irq, qcom_geni_serial_isr, +IRQF_TRIGGER_HIGH , port->name, uport); +if (ret) { +dev_err (uport->dev,"Failed to get IRQ ret %d\n" , ret);
Why print this out? Doesn't the function print an error if it fails?
drivers/tty/serial/qcom_geni_serial.c static int qcom_geni_serial_probe(struct platform_device *pdev) · line 1310
Quoted 1 line
drivers/tty/serial/qcom_geni_serial.c +1
-0+return ret;
See, an int return value :)
thanks,
greg k-h
Quoted 71 lines · Greg KH
Quoted 70 lines · Akash Asthana
Move ISR registration from startup to probe function to avoid registering it everytime when the port open is called for driver.
Signed-off-by Akash Asthana<[email protected]>---
Changes in v3:
- Address review comments on v2 patch.
- Usingdevm_kasprintfinstead of scnprintf API.drivers/tty/serial/qcom_geni_serial.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-)drivers/tty/serial/qcom_geni_serial.c +5
-11@@ -9,6 +9,7 @@#include <linux/console.h> #include <linux/io.h> #include <linux/iopoll.h> +#include <linux/irq.h> #include <linux/module.h> #include <linux/of.h> #include <linux/of_device.h> @@ -101,7 +102,7 @@struct qcom_geni_serial_port {struct uart_port uport;struct geni_se se; -char name[20 ]; +const char *name;u32 tx_fifo_depth;u32 tx_fifo_width;u32 rx_fifo_depth;@@ -830,7 +831,7 @@ static void qcom_geni_serial_shutdown(struct uart_port *uport)if (uart_console (uport))console_stop (uport->cons); -free_irq (uport->irq, uport); +disable_irq (uport->irq);spin_lock_irqsave (&uport->lock, flags);qcom_geni_serial_stop_tx (uport);qcom_geni_serial_stop_rx (uport);@@ -890,21 +891,14 @@ static int qcom_geni_serial_startup(struct uart_port *uport)int ret;struct qcom_geni_serial_port *port =to_dev_port (uport, uport); -scnprintf (port->name,sizeof (port->name), -"qcom_serial_%s%d" , - (uart_console (uport) ?"console" :"uart" ), uport->line); -if (!port->setup) { ret =qcom_geni_serial_port_setup (uport);if (ret)return ret; } +enable_irq (uport->irq); - ret =request_irq (uport->irq, qcom_geni_serial_isr,IRQF_TRIGGER_HIGH , - port->name, uport); -if (ret) -dev_err (uport->dev,"Failed to get IRQ ret %d\n" , ret); -return ret; +return 0 ; }static unsigned long get_clk_cfg (unsigned long clk_freq)@@ -1297,11 +1291,25 @@ static int qcom_geni_serial_probe(struct platform_device *pdev) port->rx_fifo_depth =DEF_FIFO_DEPTH_WORDS ; port->tx_fifo_width =DEF_FIFO_WIDTH_BITS ;
Quoted 7 lines
drivers/tty/serial/qcom_geni_serial.c static int qcom_geni_serial_probe(struct platform_device *pdev) · line 1298
Quoted 5 lines
drivers/tty/serial/qcom_geni_serial.c +5
-0+ port->name =devm_kasprintf (uport->dev,GFP_KERNEL , +"qcom_geni_serial_%s%d" , +uart_console (uport) ?"console" :"uart" , uport->line); +if (!port->name) +return ERR_PTR (-ENOMEM );Why are you returning a pointer when the return type of this function is int? Did the compiler not complain? Shouldn't this just be
-ENOMEM?
Sorry about it! I will take care of this in future. I missed it due to compiler setting, every warning was not treated as error.
Quoted 6 lines
Quoted 6 lines
drivers/tty/serial/qcom_geni_serial.c +1
-0+ irq =platform_get_irq (pdev,0 );if (irq <0 )return irq; uport->irq = irq;
Quoted 6 lines
drivers/tty/serial/qcom_geni_serial.c static int qcom_geni_serial_probe(struct platform_device *pdev) · line 1309
Quoted 5 lines
drivers/tty/serial/qcom_geni_serial.c +5
-0+irq_set_status_flags (uport->irq,IRQ_NOAUTOEN ); + ret =devm_request_irq (uport->dev, uport->irq, qcom_geni_serial_isr, +IRQF_TRIGGER_HIGH , port->name, uport); +if (ret) { +dev_err (uport->dev,"Failed to get IRQ ret %d\n" , ret);Why print this out? Doesn't the function print an error if it fails?
The function doesn't print error for every failure paths.
Quoted 6 lines
drivers/tty/serial/qcom_geni_serial.c static int qcom_geni_serial_probe(struct platform_device *pdev) · line 1310
Quoted 1 line
drivers/tty/serial/qcom_geni_serial.c +1
-0+return ret;See, an int return value :)
thanks,
greg k-h
Signature · 1 line
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,\na Linux Foundation Collaborative Project