From a579c97823d36613375d636c7b684133d8f79855 Mon Sep 17 00:00:00 2001 From: Mahati Chamarthy Date: Tue, 23 Sep 2014 21:24:47 +0530 Subject: [PATCH] Staging: media: lirc: Merge two lines and remove unused variable This patch merges an assignment with an immediately following return of the assigned variable. It also removes a variable that becomes unused due to this transformation. The following Coccinelle semantic patch was used to make this transformation: @r@ identifier ret; identifier f; @@ -ret = +return f(...); -return ret; @@ identifier r.ret; expression e1; type t; @@ ( -t ret = e1; | -t ret; ) ... when != ret when strict Signed-off-by: Mahati Chamarthy Acked-by: Julia Lawall Signed-off-by: Greg Kroah-Hartman --- drivers/staging/media/lirc/lirc_bt829.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/media/lirc/lirc_bt829.c b/drivers/staging/media/lirc/lirc_bt829.c index 3b52f86a4bd3..4c806ba41323 100644 --- a/drivers/staging/media/lirc/lirc_bt829.c +++ b/drivers/staging/media/lirc/lirc_bt829.c @@ -387,11 +387,9 @@ static unsigned char do_get_bits(void) static unsigned int read_index(unsigned char index) { unsigned char __iomem *addr; - unsigned int value; /* addr = pci_addr_lin + DATA_PCI_OFF + ((index & 0xFF) << 2); */ addr = pci_addr_lin + ((index & 0xFF) << 2); - value = readl(addr); - return value; + return readl(addr); } static void write_index(unsigned char index, unsigned int reg_val)