From mboxrd@z Thu Jan 1 00:00:00 1970 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=-19.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=unavailable 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 6736FC48BC2 for ; Wed, 23 Jun 2021 18:24:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 525B2611AC for ; Wed, 23 Jun 2021 18:24:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229999AbhFWS1G (ORCPT ); Wed, 23 Jun 2021 14:27:06 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:52897 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229926AbhFWS0x (ORCPT ); Wed, 23 Jun 2021 14:26:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624472675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zt+reJW9iH4L44dg7M6KqKyx61iwDVr84RgiCAGE6Po=; b=OLaxUuAp7bXlKX9dAfhlmhBzOTKYzy2n39e+Yw96WWfU6rp1sOVFvMuSU2tdhuBHWFXJ7F uB7o85VL4UdwLkej/lEFirqZ3CK0hXyiApMsKlqSL6N5f+6bmvrZiYNmx7/zQ349pnYjko qXbZuhkajXe4K8pNGysax0I5+Q2ZBak= Received: from mail-oi1-f198.google.com (mail-oi1-f198.google.com [209.85.167.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-357-Z5GtW3k1NeaH6jBpkniVQg-1; Wed, 23 Jun 2021 14:24:34 -0400 X-MC-Unique: Z5GtW3k1NeaH6jBpkniVQg-1 Received: by mail-oi1-f198.google.com with SMTP id l123-20020acad4810000b02901f1fb44dca7so2226791oig.15 for ; Wed, 23 Jun 2021 11:24:34 -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=zt+reJW9iH4L44dg7M6KqKyx61iwDVr84RgiCAGE6Po=; b=YTNEqJWnXH2FuJ8Js3ISlIGsQtHj8pIEl/C1OMXF2v3OzR2etlB48fY4UphZkI9rs8 5I6e2b2+FPKbd/IgN+NJJ6zc6zQwjIZnmsASdEEpLdIlr4hZ/K/YtvuJ5YNtpUn7HwD+ pOAQJwcbwX4DzCcqHE7KvKMvJFDi6QmVYMVvEshirDvZhldIoXVHogAwDL8IectRP04f gE3pyjUEKrz6F3etWOpFGabqBP/UhjH4y2wfkFeEjSKEx2KGwZemKbTh62QA+UBUJeVE 5JzJ0XgtDSHIZmTMWDE85ZhMViMBpwch53nuJpv8PodKG7+U1ueIyvPh5jhAtCfiEorM oaXw== X-Gm-Message-State: AOAM530yuKmgvOvpH9ixOkuKOaRxsjmEwFI9V2SDXCkeaEm4/QUOlC5l GjHBBX9zFBVCG5khSl973Jt9q1dcCtqGwmLPlmZDA03cHvo8sIo7NxiJWFzfo8WzDJtUErSkOJB SV2X/WKGSQPNMQCqw4D0shQ== X-Received: by 2002:a4a:db42:: with SMTP id 2mr924970oot.47.1624472673541; Wed, 23 Jun 2021 11:24:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyz4UFSl246oaEQqLiNgeEp6ZLXg4v/5NOgNJIyJ0IuAfGDYUCGLmn5W16/1naj3Oifo/u2IQ== X-Received: by 2002:a4a:db42:: with SMTP id 2mr924957oot.47.1624472673390; Wed, 23 Jun 2021 11:24:33 -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 l24sm105186oii.45.2021.06.23.11.24.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jun 2021 11:24:33 -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 v3 4/7] fpga-mgr: wrap the status() op Date: Wed, 23 Jun 2021 11:24:07 -0700 Message-Id: <20210623182410.3787784-6-trix@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210623182410.3787784-1-trix@redhat.com> References: <20210623182410.3787784-1-trix@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-fpga@vger.kernel.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 8f97e16e36f7e..6bfc4482abbf4 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"); -- 2.26.3