From patchwork Sun Jul 18 01:51:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moritz Fischer X-Patchwork-Id: 12384131 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1721AC636CB for ; Sun, 18 Jul 2021 01:51:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EA74061103 for ; Sun, 18 Jul 2021 01:51:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233376AbhGRByO (ORCPT ); Sat, 17 Jul 2021 21:54:14 -0400 Received: from mail-pf1-f180.google.com ([209.85.210.180]:38593 "EHLO mail-pf1-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232685AbhGRByN (ORCPT ); Sat, 17 Jul 2021 21:54:13 -0400 Received: by mail-pf1-f180.google.com with SMTP id i14so882964pfd.5; Sat, 17 Jul 2021 18:51:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=o06ssx91GTtHRONE1cdsYw3UDhFvrKEaTUOFNaT/QnA=; b=gN4W9lkxYpHeSi93GHkQYPeoisYknxjGuGzbqi7HcPK+LgeEtb04xNLoRo36N7jBfE 0kgZ3h8V+AdzUd4tKEpR4pnJi4oLMcFor0NtPVc2KN/TEw/AOmioOiOTiHV54xy1JKu6 bZ6LM0ztAd3143KuJ1BEglNB2RLbA9xNoM1SYXsv6uozMivyydvkCjPgd3JdgV1MppU2 A3MgJJTP4x4gdx29+0E3Z10njZiiLi+3//bnRO3OZxpOykw+zSB4LfemQxIYqRVgUjcG tj08wDyTFdK8MRANfwaj8AlrxDUB8bL0bRJMlA8Ud/MxXxvMV3ETbcNk1LQicmANl2ZS G1Cw== X-Gm-Message-State: AOAM531B4fEJfNJN4xWlFunioDzjnpQyb4wxEEHNlcJTYnOUUVBe/GPk 6qT5UNDjuSB8irg2gbgyUO7dzfeWUcA= X-Google-Smtp-Source: ABdhPJx+Wq3Cgu2wXGZbZqBol0/gKpzouK1wZzqlU9X7BSowIeBzurDfahVwBp33k8QhYJI8rivuvA== X-Received: by 2002:aa7:8ec5:0:b029:33b:7b34:9cba with SMTP id b5-20020aa78ec50000b029033b7b349cbamr5701256pfr.35.1626573075239; Sat, 17 Jul 2021 18:51:15 -0700 (PDT) Received: from localhost ([24.4.24.239]) by smtp.gmail.com with ESMTPSA id 78sm6294440pfw.189.2021.07.17.18.51.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Jul 2021 18:51:14 -0700 (PDT) From: Moritz Fischer To: linux-kernel@vger.kernel.org Cc: linux-usb@vger.kernel.org, moritzf@google.com, mathias.nyman@intel.com, gregkh@linuxfoundation.org, Moritz Fischer , Vinod Koul Subject: [PATCH 1/2] usb: xhci-renesas: Minor coding style cleanup Date: Sat, 17 Jul 2021 18:51:10 -0700 Message-Id: <20210718015111.389719-2-mdf@kernel.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210718015111.389719-1-mdf@kernel.org> References: <20210718015111.389719-1-mdf@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Change an explicit err == 0 to !err. No functional change. Cc: Mathias Nyman Cc: Greg Kroah-Hartman Cc: Vinod Koul Signed-off-by: Moritz Fischer --- drivers/usb/host/xhci-pci-renesas.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/host/xhci-pci-renesas.c b/drivers/usb/host/xhci-pci-renesas.c index 1da647961c25..327f6a6d5672 100644 --- a/drivers/usb/host/xhci-pci-renesas.c +++ b/drivers/usb/host/xhci-pci-renesas.c @@ -595,7 +595,7 @@ int renesas_xhci_check_request_fw(struct pci_dev *pdev, err = renesas_fw_check_running(pdev); /* Continue ahead, if the firmware is already running. */ - if (err == 0) + if (!err) return 0; if (err != 1) From patchwork Sun Jul 18 01:51:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moritz Fischer X-Patchwork-Id: 12384133 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1300EC636CA for ; Sun, 18 Jul 2021 01:51:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E5004610C7 for ; Sun, 18 Jul 2021 01:51:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232685AbhGRByR (ORCPT ); Sat, 17 Jul 2021 21:54:17 -0400 Received: from mail-pl1-f179.google.com ([209.85.214.179]:46973 "EHLO mail-pl1-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233428AbhGRByP (ORCPT ); Sat, 17 Jul 2021 21:54:15 -0400 Received: by mail-pl1-f179.google.com with SMTP id c15so7618286pls.13; Sat, 17 Jul 2021 18:51:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=NG6pheoCZKg5UXChiGjOLrLU9fLUpsB1CjGA68gDk8k=; b=tJDge/o+yeqJDcdkBEI9FsGha/sE8vIVAhoX4RJpYryq4sbAeSAPqe5HMjaCj6BhBt TC3Cm+tRz4t6EMZ+cdyF6IiSnGx2jkwkTndxN0gldkvYZHrNGDmNfJs2/t4tLeMOGcmh bBwvqzB0CL3Y4UutLNjOU7reYzgF/3gw8VHnOBDd3RMu60Zd7NUwqLU4rS4x5qp69jOH FsuAKo5w3aWksy0nDCUivgNs8RS3ivZFvjusmej+yiS9HBH7zqcLYH36PHLIiW1QVtJ3 GtqSPLXbNvCZ7DGJQS8UiRoLCHRJDJ4mK7FN1EuvzQJcLNTC7I/3qRi8Zj1U0Qj9382f x8iA== X-Gm-Message-State: AOAM532I6Y/OfBuOp9mc3F+Ap8/JvNLwtUKQbMlGPrFXL+2KJGy21v7/ GFlpdnLoZqVWtR2xkNC2EFlE+0uPpsc= X-Google-Smtp-Source: ABdhPJzto7UloYy2y1932tH4/csp9BczYENPIJQN0qn19MDDh3Lc0exmtcvMH1cFQ/pVNaGwxEQ/QA== X-Received: by 2002:a17:903:234f:b029:12b:7bad:75cb with SMTP id c15-20020a170903234fb029012b7bad75cbmr3028593plh.67.1626573076666; Sat, 17 Jul 2021 18:51:16 -0700 (PDT) Received: from localhost ([24.4.24.239]) by smtp.gmail.com with ESMTPSA id q3sm14726441pfj.89.2021.07.17.18.51.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 17 Jul 2021 18:51:16 -0700 (PDT) From: Moritz Fischer To: linux-kernel@vger.kernel.org Cc: linux-usb@vger.kernel.org, moritzf@google.com, mathias.nyman@intel.com, gregkh@linuxfoundation.org, Moritz Fischer , Vinod Koul Subject: [PATCH 2/2] usb: renesas-xhci: Remove renesas_xhci_pci_exit() Date: Sat, 17 Jul 2021 18:51:11 -0700 Message-Id: <20210718015111.389719-3-mdf@kernel.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210718015111.389719-1-mdf@kernel.org> References: <20210718015111.389719-1-mdf@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org Remove empty function renesas_xhci_pci_exit() that does not actually do anything. Cc: Mathias Nyman Cc: Greg Kroah-Hartman Cc: Vinod Koul Signed-off-by: Moritz Fischer --- drivers/usb/host/xhci-pci-renesas.c | 5 ----- drivers/usb/host/xhci-pci.c | 2 -- drivers/usb/host/xhci-pci.h | 3 --- 3 files changed, 10 deletions(-) diff --git a/drivers/usb/host/xhci-pci-renesas.c b/drivers/usb/host/xhci-pci-renesas.c index 327f6a6d5672..1ebacc42a552 100644 --- a/drivers/usb/host/xhci-pci-renesas.c +++ b/drivers/usb/host/xhci-pci-renesas.c @@ -620,9 +620,4 @@ int renesas_xhci_check_request_fw(struct pci_dev *pdev, } EXPORT_SYMBOL_GPL(renesas_xhci_check_request_fw); -void renesas_xhci_pci_exit(struct pci_dev *dev) -{ -} -EXPORT_SYMBOL_GPL(renesas_xhci_pci_exit); - MODULE_LICENSE("GPL v2"); diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c index 18c2bbddf080..4456ba338b74 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -449,8 +449,6 @@ static void xhci_pci_remove(struct pci_dev *dev) struct xhci_hcd *xhci; xhci = hcd_to_xhci(pci_get_drvdata(dev)); - if (xhci->quirks & XHCI_RENESAS_FW_QUIRK) - renesas_xhci_pci_exit(dev); xhci->xhc_state |= XHCI_STATE_REMOVING; diff --git a/drivers/usb/host/xhci-pci.h b/drivers/usb/host/xhci-pci.h index acd7cf0a1706..cb9a8f331a44 100644 --- a/drivers/usb/host/xhci-pci.h +++ b/drivers/usb/host/xhci-pci.h @@ -7,7 +7,6 @@ #if IS_ENABLED(CONFIG_USB_XHCI_PCI_RENESAS) int renesas_xhci_check_request_fw(struct pci_dev *dev, const struct pci_device_id *id); -void renesas_xhci_pci_exit(struct pci_dev *dev); #else static int renesas_xhci_check_request_fw(struct pci_dev *dev, @@ -16,8 +15,6 @@ static int renesas_xhci_check_request_fw(struct pci_dev *dev, return 0; } -static void renesas_xhci_pci_exit(struct pci_dev *dev) { }; - #endif struct xhci_driver_data {