From patchwork Tue Jun 8 19:55:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rix X-Patchwork-Id: 12308069 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=-16.9 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 2BCA6C47082 for ; Tue, 8 Jun 2021 19:59:02 +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 E5B536024A for ; Tue, 8 Jun 2021 19:59:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E5B536024A 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=RJBeZSXGxpUL0c0tJUmMbi/tZCjlEEnJKusKI0g60z8=; b=k6hheyPPgnJZYI Trbej3jvBVO9mhVUYLhVvm0l+0xODVNfbs8gxPkCDELyHGL92rFB3nFokzNYnc2BEgwzCORetxr+m XFL795Hve2YyTlVuiC7ecNPnRfxmZMleaY1aR++o74iYHgH1m9c7CCc6AHzA0YJselBBpn7TAx4n2 NcA09C0hOhVc+PO+tcw+oINNomqDdb9mRg6VyDpGB92Qt6jwi0mqcqF1D+jWLRnH+B7GiDbWsVDul KH5wSnP5n+NY88Ps5Vg+VlCkQS9Z0b13IrlQl4eKzWs7ZVRm9ligYAtneitw/ygruZAsPCJvbY/et V5P2IweFSIFMWCjMK5vA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqhqL-00AKTj-AN; Tue, 08 Jun 2021 19:56:57 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqhom-00AIin-Hj for linux-arm-kernel@lists.infradead.org; Tue, 08 Jun 2021 19:55:23 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623182119; 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=htxg7QFhlugIkUjEBRB6MmryeZkakMXu7uhWLDq62MQ=; b=e5vVPMZQOjd9/476FXYGPR+h5gHpqseZg6paLoxBC2pZ/dftCiNK2dGsHOWQZ/XXYq6mlf WpjE8+a30srWmPhvifMYFpe2n7P8wkafjaTZtvkjgS9S571hGcTjJJQibc5VzTEZtDaI5V YFnjttPpI+8rebH+dlURNyMrcdIWFNw= Received: from mail-oo1-f71.google.com (mail-oo1-f71.google.com [209.85.161.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-506-r34K9cMMOfGrusT4BIU7PA-1; Tue, 08 Jun 2021 15:55:18 -0400 X-MC-Unique: r34K9cMMOfGrusT4BIU7PA-1 Received: by mail-oo1-f71.google.com with SMTP id o21-20020a4ae5950000b0290211a73e7f50so13946597oov.12 for ; Tue, 08 Jun 2021 12:55:18 -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=htxg7QFhlugIkUjEBRB6MmryeZkakMXu7uhWLDq62MQ=; b=Df7ptTJ70tHvgfBaUikhKWhO5SyxzkkTo3pEBy+eNLne+hKAmr02jXQXq3gVto1uUo I8/7SCA+jiH4wEYkhRxOcl/qIG5CbDeoXIz/aqPWYbFsnCN50GI3HrYkf0SdZxiEsaqI i9qAhQGXsA3ffjLDH9vHXhrY7WuTjFFRwZB1dVkvRoSp+7mLa2PRilje01NaYqKBegEq MkLNARk3GJFrmpnwBBcVG+F//tze633pdz1dFGjlPoPvc1YfiA/WZj/j8h/4mtJzdFMW u+2cZ9e5ElYgMmzpfp6ajwCoWkCQYFvQPU6qQ7K5hHKTp1GhAIpx//rxBhk+5L80H16j Lbwg== X-Gm-Message-State: AOAM530pvPy0pRpVaCQ7P62pVmZYZU7hHixL2m16dTPdyIXnM1CqfEDK OtXDKJLosVi+/9531wQZ0KctA8L5uHwDc3gmbpnPh5xLeR0zuddJwcVfTIYOoX2HIE1PBhltiGJ LuTqS54z4tYr+FDhTJRTMHf8HWwSk926u81w= X-Received: by 2002:aca:4703:: with SMTP id u3mr3955501oia.37.1623182117640; Tue, 08 Jun 2021 12:55:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzkQnduqFmHXGXncV3/7jvv7BP7nZordQ4ddUIl4lAERn1K6+6xmEGbcvd4LPsWckV0CQEsPA== X-Received: by 2002:aca:4703:: with SMTP id u3mr3955495oia.37.1623182117532; Tue, 08 Jun 2021 12:55:17 -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 s17sm3024046oog.31.2021.06.08.12.55.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Jun 2021 12:55:17 -0700 (PDT) From: trix@redhat.com To: hao.wu@intel.com, mdf@kernel.org, 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 v2 4/7] fpga-mgr: wrap the status() op Date: Tue, 8 Jun 2021 12:55:03 -0700 Message-Id: <20210608195506.3022550-6-trix@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210608195506.3022550-1-trix@redhat.com> References: <20210608195506.3022550-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-20210608_125520_722206_687E5699 X-CRM114-Status: GOOD ( 12.19 ) 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 An FPGA manager is not required to provide a status() op. Add a wrapper consistent with the other op wrappers. Move the op check to the wrapper. Default to 0, no errors to report. Signed-off-by: Tom Rix --- drivers/fpga/fpga-mgr.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c index c484b4309b2f4..cc531f0537acf 100644 --- a/drivers/fpga/fpga-mgr.c +++ b/drivers/fpga/fpga-mgr.c @@ -426,6 +426,14 @@ static ssize_t state_show(struct device *dev, return sprintf(buf, "%s\n", state_str[mgr->state]); } +static u64 fpga_mgr_status(struct fpga_manager *mgr) +{ + if (mgr->mops && mgr->mops->status) + return mgr->mops->status(mgr); + + return 0; +} + static ssize_t status_show(struct device *dev, struct device_attribute *attr, char *buf) { @@ -433,10 +441,7 @@ static ssize_t status_show(struct device *dev, u64 status; int len = 0; - if (!mgr->mops->status) - return -ENOENT; - - status = mgr->mops->status(mgr); + status = fpga_mgr_status(mgr); if (status & FPGA_MGR_STATUS_OPERATION_ERR) len += sprintf(buf + len, "reconfig operation error\n");