From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755304AbbINPNd (ORCPT ); Mon, 14 Sep 2015 11:13:33 -0400 Received: from mail-pa0-f49.google.com ([209.85.220.49]:35699 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755243AbbINPN3 (ORCPT ); Mon, 14 Sep 2015 11:13:29 -0400 From: Sudip Mukherjee To: Thomas Dahlmann , Felipe Balbi , Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, linux-geode@lists.infradead.org, linux-usb@vger.kernel.org, Sudip Mukherjee Subject: [PATCH 06/16] usb: gadget: amd5536udc: remove unnecessary conditions Date: Mon, 14 Sep 2015 20:42:53 +0530 Message-Id: <1442243583-24741-7-git-send-email-sudipm.mukherjee@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1442243583-24741-1-git-send-email-sudipm.mukherjee@gmail.com> References: <1442243583-24741-1-git-send-email-sudipm.mukherjee@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The condition checking for irq_registered, regs, mem_region and active are not required as this is the remove function. And we are in the remove means that probe was successful and they can never be NULL at this point of code. It was required in the original code as the remove function was part of the error handler of probe function. Signed-off-by: Sudip Mukherjee --- drivers/usb/gadget/udc/amd5536udc.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/usb/gadget/udc/amd5536udc.c b/drivers/usb/gadget/udc/amd5536udc.c index 3ae0bb8..e2f6128 100644 --- a/drivers/usb/gadget/udc/amd5536udc.c +++ b/drivers/usb/gadget/udc/amd5536udc.c @@ -3135,15 +3135,11 @@ static void udc_pci_remove(struct pci_dev *pdev) /* reset controller */ writel(AMD_BIT(UDC_DEVCFG_SOFTRESET), &dev->regs->cfg); - if (dev->irq_registered) - free_irq(pdev->irq, dev); - if (dev->regs) - iounmap(dev->regs); - if (dev->mem_region) - release_mem_region(pci_resource_start(pdev, 0), + free_irq(pdev->irq, dev); + iounmap(dev->regs); + release_mem_region(pci_resource_start(pdev, 0), pci_resource_len(pdev, 0)); - if (dev->active) - pci_disable_device(pdev); + pci_disable_device(pdev); udc_remove(dev); } -- 1.9.1