Skip to contentSkip to conversation

serial: dz: use atomic_inc and atomic_dec instead of atomic_add

PATCH Superseded [email protected] 2 participants 2 messages Oct 12, 2022 – Oct 13, 2022

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 serial: dz: use atomic_inc and atomic_dec instead of atomic_add

From: Xu Panda <[email protected]>

There is a better way for atomic_dec_return and atomic_inc.

---
 drivers/tty/serial/dz.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/tty/serial/dz.c +7 -7
index 829b452daee9..84476cef3278 100644
@@ -404,14 +404,14 @@ static int dz_startup(struct uart_port *uport)
 	int ret;
 	u16 tmp;
 
-	irq_guard = atomic_add_return(1, &mux->irq_guard);
+	irq_guard = atomic_inc_return(&mux->irq_guard);
 	if (irq_guard != 1)
 		return 0;
 
 	ret = request_irq(dport->port.irq, dz_interrupt,
 			  IRQF_SHARED, "dz", mux);
 	if (ret) {
-		atomic_add(-1, &mux->irq_guard);
+		atomic_dec(&mux->irq_guard);
 		printk(KERN_ERR "dz: Cannot get IRQ %d!\n", dport->port.irq);
 		return ret;
 	}
@@ -448,7 +448,7 @@ static void dz_shutdown(struct uart_port *uport)
 	dz_stop_tx(&dport->port);
 	spin_unlock_irqrestore(&dport->port.lock, flags);
 
-	irq_guard = atomic_add_return(-1, &mux->irq_guard);
+	irq_guard = atomic_dec_return(&mux->irq_guard);
 	if (!irq_guard) {
 		/* Disable interrupts.  */
 		tmp = dz_in(dport, DZ_CSR);
@@ -668,7 +668,7 @@ static void dz_release_port(struct uart_port *uport)
 	iounmap(uport->membase);
 	uport->membase = NULL;
 
-	map_guard = atomic_add_return(-1, &mux->map_guard);
+	map_guard = atomic_dec_return(&mux->map_guard);
 	if (!map_guard)
 		release_mem_region(uport->mapbase, dec_kn_slot_size);
 }
@@ -691,11 +691,11 @@ static int dz_request_port(struct uart_port *uport)
 	int map_guard;
 	int ret;
 
-	map_guard = atomic_add_return(1, &mux->map_guard);
+	map_guard = atomic_inc_return(&mux->map_guard);
 	if (map_guard == 1) {
 		if (!request_mem_region(uport->mapbase, dec_kn_slot_size,
 					"dz")) {
-			atomic_add(-1, &mux->map_guard);
+			atomic_dec(&mux->map_guard);
 			printk(KERN_ERR
 			       "dz: Unable to reserve MMIO resource\n");
 			return -EBUSY;
@@ -703,7 +703,7 @@ static int dz_request_port(struct uart_port *uport)
 	}
 	ret = dz_map_port(uport);
 	if (ret) {
-		map_guard = atomic_add_return(-1, &mux->map_guard);
+		map_guard = atomic_dec_return(&mux->map_guard);
 		if (!map_guard)
 			release_mem_region(uport->mapbase, dec_kn_slot_size);
 		return ret;
Signature · 1 line
2.15.2
maintainer
#1 lore raw
Quoted 3 lines · On 12. 10. 22, 12:09, [email protected] wrote:

From: Xu Panda <[email protected]>

There is a better way for atomic_dec_return and atomic_inc.

While the patch below looks fine, I don't understand this sentence ^^^. Care to reformulate? And please append () when writing about function names.

Quoted 68 lines
---
  drivers/tty/serial/dz.c | 14 +++++++-------
  1 file changed, 7 insertions(+), 7 deletions(-)
drivers/tty/serial/dz.c +7 -7
index 829b452daee9..84476cef3278 100644
@@ -404,14 +404,14 @@ static int dz_startup(struct uart_port *uport)
  	int ret;
  	u16 tmp;
 
-	irq_guard = atomic_add_return(1, &mux->irq_guard);
+	irq_guard = atomic_inc_return(&mux->irq_guard);
  	if (irq_guard != 1)
  		return 0;
 
  	ret = request_irq(dport->port.irq, dz_interrupt,
  			  IRQF_SHARED, "dz", mux);
  	if (ret) {
-		atomic_add(-1, &mux->irq_guard);
+		atomic_dec(&mux->irq_guard);
  		printk(KERN_ERR "dz: Cannot get IRQ %d!\n", dport->port.irq);
  		return ret;
  	}
@@ -448,7 +448,7 @@ static void dz_shutdown(struct uart_port *uport)
  	dz_stop_tx(&dport->port);
  	spin_unlock_irqrestore(&dport->port.lock, flags);
 
-	irq_guard = atomic_add_return(-1, &mux->irq_guard);
+	irq_guard = atomic_dec_return(&mux->irq_guard);
  	if (!irq_guard) {
  		/* Disable interrupts.  */
  		tmp = dz_in(dport, DZ_CSR);
@@ -668,7 +668,7 @@ static void dz_release_port(struct uart_port *uport)
  	iounmap(uport->membase);
  	uport->membase = NULL;
 
-	map_guard = atomic_add_return(-1, &mux->map_guard);
+	map_guard = atomic_dec_return(&mux->map_guard);
  	if (!map_guard)
  		release_mem_region(uport->mapbase, dec_kn_slot_size);
  }
@@ -691,11 +691,11 @@ static int dz_request_port(struct uart_port *uport)
  	int map_guard;
  	int ret;
 
-	map_guard = atomic_add_return(1, &mux->map_guard);
+	map_guard = atomic_inc_return(&mux->map_guard);
  	if (map_guard == 1) {
  		if (!request_mem_region(uport->mapbase, dec_kn_slot_size,
  					"dz")) {
-			atomic_add(-1, &mux->map_guard);
+			atomic_dec(&mux->map_guard);
  			printk(KERN_ERR
  			       "dz: Unable to reserve MMIO resource\n");
  			return -EBUSY;
@@ -703,7 +703,7 @@ static int dz_request_port(struct uart_port *uport)
  	}
  	ret = dz_map_port(uport);
  	if (ret) {
-		map_guard = atomic_add_return(-1, &mux->map_guard);
+		map_guard = atomic_dec_return(&mux->map_guard);
  		if (!map_guard)
  			release_mem_region(uport->mapbase, dec_kn_slot_size);
  		return ret;
Signature · 2 lines
js
suse labs