The patch titled jsm: fix the return variable and remov the unused retval has been removed from the -mm tree. Its filename was jsm-fix-the-return-variable-and-remov-the-unused-retval.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: jsm: fix the return variable and remov the unused retval From: Breno Leitao <leitao@xxxxxxxxxxxxxxxxxx> Fix the return variable and removing the unused retval. As it was, the retval was never returned, so its assignments were silly. Just consolidate everything to rc, and remove the unused retval variable. Signed-off-by: Breno Leitao <leitao@xxxxxxxxxxxxxxxxxx> Cc: Scott Kilau <scottk@xxxxxxxx> Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/serial/jsm/jsm_driver.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff -puN drivers/serial/jsm/jsm_driver.c~jsm-fix-the-return-variable-and-remov-the-unused-retval drivers/serial/jsm/jsm_driver.c --- a/drivers/serial/jsm/jsm_driver.c~jsm-fix-the-return-variable-and-remov-the-unused-retval +++ a/drivers/serial/jsm/jsm_driver.c @@ -57,7 +57,6 @@ static int jsm_probe_one(struct pci_dev int rc = 0; struct jsm_board *brd; static int adapter_count = 0; - int retval; rc = pci_enable_device(pdev); if (rc) { @@ -134,7 +133,7 @@ static int jsm_probe_one(struct pci_dev rc = jsm_tty_init(brd); if (rc < 0) { dev_err(&pdev->dev, "Can't init tty devices (%d)\n", rc); - retval = -ENXIO; + rc = -ENXIO; goto out_free_irq; } @@ -142,7 +141,7 @@ static int jsm_probe_one(struct pci_dev if (rc < 0) { /* XXX: leaking all resources from jsm_tty_init here! */ dev_err(&pdev->dev, "Can't init uart port (%d)\n", rc); - retval = -ENXIO; + rc = -ENXIO; goto out_free_irq; } @@ -161,7 +160,7 @@ static int jsm_probe_one(struct pci_dev /* XXX: leaking all resources from jsm_tty_init and jsm_uart_port_init here! */ dev_err(&pdev->dev, "memory allocation for flipbuf failed\n"); - retval = -ENOMEM; + rc = -ENOMEM; goto out_free_irq; } _ Patches currently in -mm which might be from leitao@xxxxxxxxxxxxxxxxxx are linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html