From patchwork Thu Jun 24 21:17:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rix X-Patchwork-Id: 12343239 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.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 4543EC49EA7 for ; Thu, 24 Jun 2021 21:20:50 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 144BC6124C for ; Thu, 24 Jun 2021 21:20:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 144BC6124C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=u9HotZu8McZpQT9QqC26bY3LlNf3RgzuhbAEGUTPecI=; b=uCYfthEdyQ6HvV i7h/3Bd7nUI3s6v2k8CLwHglvVdBZ+NxIgbuNtJTwidyXCPiUXSJh2jQNTjMGkl2WXKgEVbpg0+v5 8KT5ClzdFOqH0kNLoO8SBKRUh++SnCQs4gFwHKafED0nKroBU+T5prK54UvSI51G7WSjRRjQPDHc6 uVNBRKF6B2WC1SV+S1rhbRiP6ROsdD4gbXiqww1k+9+MEamnnjHPoskWFjChDQj/B7Kbua/h5rUH0 J2v1lhrqcFR6pM8AEZVwnGnLRJz81EUrsm1m0eFrTaIJl3mJQWYVEZc8ynlariOhhSfaMSSDKPLuw +p2qh0F9RJmDF/f7sVVA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lwWkc-00GKZN-AM; Thu, 24 Jun 2021 21:19:06 +0000 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lwWjd-00GKGG-0m for linux-arm-kernel@lists.infradead.org; Thu, 24 Jun 2021 21:18:06 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624569484; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QEL5AZ4mSr0YqB6XpyjJsxT+Qv98DMEzNJZysot2Lnw=; b=FgrcBf7+4gMaY1yGRHkR3kahGHrU+WUqho8AtpqyHizIHHG3JiG2859paaC3Ts7ng7qvpW HY+q/f1uSFa1sypHEBw0ZlEuUU+Fm3En89kme8/WJMfIuFCcAoim7mOe4/BLP+YZ4utm4n Y+saZwxRNWG2i8scZ5SaAQkILW0veRE= Received: from mail-oi1-f197.google.com (mail-oi1-f197.google.com [209.85.167.197]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-587-aE8DJZCaPGqefFbHe_DGgw-1; Thu, 24 Jun 2021 17:18:02 -0400 X-MC-Unique: aE8DJZCaPGqefFbHe_DGgw-1 Received: by mail-oi1-f197.google.com with SMTP id z18-20020a0568080652b029022413cd7d4dso4581626oih.11 for ; Thu, 24 Jun 2021 14:18:02 -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=QEL5AZ4mSr0YqB6XpyjJsxT+Qv98DMEzNJZysot2Lnw=; b=kfV6z1IPA10bMPtd6kbM5MNS+I8HscyCk7Uj//dpZTGRgx+Kk+bnlKDXNrpsL3Yiee Tc1s2LLQDllOEM7opu4/Jhu9nxVWOWy9UxJQgzndVfJ2BxavorTVKTofI3Ib2+nMM3rg i+qxJPnLq2ErAIGJkGmKeVfJVAYLjdHzlQfN234g4ACF84lh0UMg75Bd8WzGa8aInyZv TZRNchiJ5KPULeAQEK7KwK0U47f1sQeJLCq/076VXIF46aGUuHc3t1u4uQHUAFxvTg/b bRVUhGVoAyiQ3fUGZkc5XDWN9Tk3PgQy60rzrtA4Y8uNNr79d6nG/1wFiUKJ0cfKC45F 44vw== X-Gm-Message-State: AOAM531YS2IhA0LJ/E56OiO2v2SLwoGCygQLu/GPtCL50bTWNBDOKxLQ 7wswOEriQjZwKyN5t3cW7I5frMtWQaSnFTfUzTdOrajCQAxIKeadEDVkbWrq7pWodjV5QSlzttT cN13U4Ykxu0VIAVStJCcgV3zaCu1EQCFdLxM= X-Received: by 2002:a05:6830:270b:: with SMTP id j11mr6370721otu.161.1624569481796; Thu, 24 Jun 2021 14:18:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzOtcE8iHvqrMnsAhoUJeiWnBz2O5EA2IJu/b1p2L7kvKl5sId+fviItFlU87dzuMw8Y+u/bg== X-Received: by 2002:a05:6830:270b:: with SMTP id j11mr6370708otu.161.1624569481664; Thu, 24 Jun 2021 14:18:01 -0700 (PDT) Received: from localhost.localdomain.com (075-142-250-213.res.spectrum.com. [75.142.250.213]) by smtp.gmail.com with ESMTPSA id 94sm915513otj.33.2021.06.24.14.17.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Jun 2021 14:18:00 -0700 (PDT) From: trix@redhat.com To: mdf@kernel.org, hao.wu@intel.com, michal.simek@xilinx.com Cc: linux-fpga@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Tom Rix Subject: [PATCH v4 5/5] fpga: fpga-mgr: simplify mops check in wrappers Date: Thu, 24 Jun 2021 14:17:27 -0700 Message-Id: <20210624211727.501019-7-trix@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210624211727.501019-1-trix@redhat.com> References: <20210624211727.501019-1-trix@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=trix@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210624_141805_197191_23BD4551 X-CRM114-Status: GOOD ( 12.64 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Tom Rix The mops value is checked in fpga_mgr_create, do not check it twice. Signed-off-by: Tom Rix --- drivers/fpga/fpga-mgr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c index 2abb7043858dc..21b4fd34b1dbf 100644 --- a/drivers/fpga/fpga-mgr.c +++ b/drivers/fpga/fpga-mgr.c @@ -28,14 +28,14 @@ struct fpga_mgr_devres { /* mops wrappers */ static inline enum fpga_mgr_states fpga_mgr_state(struct fpga_manager *mgr) { - if (mgr->mops && mgr->mops->state) + if (mgr->mops->state) return mgr->mops->state(mgr); return FPGA_MGR_STATE_UNKNOWN; } static inline u64 fpga_mgr_status(struct fpga_manager *mgr) { - if (mgr->mops && mgr->mops->status) + if (mgr->mops->status) return mgr->mops->status(mgr); return 0; } @@ -93,7 +93,7 @@ static inline int fpga_mgr_write_complete(struct fpga_manager *mgr, static inline void fpga_mgr_fpga_remove(struct fpga_manager *mgr) { - if (mgr->mops && mgr->mops->fpga_remove) + if (mgr->mops->fpga_remove) mgr->mops->fpga_remove(mgr); }