From patchwork Mon Jun 7 17:24:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rix X-Patchwork-Id: 12304201 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,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 DB097C47094 for ; Mon, 7 Jun 2021 17:27:56 +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 A6BF161090 for ; Mon, 7 Jun 2021 17:27:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A6BF161090 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=8FXd9KdNQ1wML5c9l9YMOoFrmDa//cunzuFMLy9rC90=; b=T2Ev4QRQc3ng/x CMGEmsIA7kPwdGvZroJN9n2x1drb4mMLDUuiclqgNTizG10rsRN45hzBkyxcvevtpwuRkJVY7wqRM 9I7skXso/RKJyex08JmwPmkqmWhdmEv26rzjpdnvhreRg0nZl1SMC/teMOUZQG++oxWNraA/DipGR hVW0U02p5W9qWn9U+L/PinByshD7knb0tJgIf0m/AFiHe0p4CjGClbncywJYOHFxqDEUyk3WxMEQq hCtZYhkEbQWdNmoYCLGEvJ8I48Ju0Vyw45nLMdefaUOrqsNX7T3wq7vmJ9rlZTJ3q5DACtDkgEX5c veuhzSW0foGyTTXD1avQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqJ0d-004mZJ-Cw; Mon, 07 Jun 2021 17:25:55 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqIzO-004mBq-CR for linux-arm-kernel@lists.infradead.org; Mon, 07 Jun 2021 17:24:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623086677; 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=laSi6Idv6MJlRydvvlMqTdjYXdoIYW3EUNa0fNYB5JY=; b=KgAQ18yALYDPBowT4sAyDuvfXNqTkFTTKvsjUmIX3fi6fYcy9ytwUyz92QNN7ZuHbumV5l xsoZjzv4PFVG8iJ2naB/JNK2l4S5tFvX8A1TYeMWVpp8vSLhDULXl3qaPLL60FyJl0gCAH YUeezCElQyMalrw+WM1d8FBZainQRxk= 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-534--vzuHpUCPPap0pbzsvunMQ-1; Mon, 07 Jun 2021 13:24:36 -0400 X-MC-Unique: -vzuHpUCPPap0pbzsvunMQ-1 Received: by mail-oi1-f197.google.com with SMTP id 82-20020aca04550000b02901f40670cf75so1991519oie.19 for ; Mon, 07 Jun 2021 10:24:36 -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=laSi6Idv6MJlRydvvlMqTdjYXdoIYW3EUNa0fNYB5JY=; b=pP8lgkLmsoBnxTvSL3Eo5NvIS//E5cnm2E4mLefzAi/8oqKp1hU59Tkm3Hg9S4TIfp odkmRKLQL6PId4xFDEmEx7vFbdP0luXLHo2xRZucChx5nyy3VS/Ioq7hP7VLoWM/7A2c m7BqR0GndojzcB/ytPQXg+YjWuF9ZTWMxNIBYBbklq/tEVC7WH54CyfpCn7PsWokuHvq NQCiGbm4HORetIEUTCPGNitTI4f6pBhH5zl+bvgS2mW5ggH1qPg0+1RAugH16aa8S8ne M5ngzWhecNFTzjbOJugCi0lY6yfGRrI5J4XWAXNg8VctWwurT+oPzsX9JOkeqfQxxGXO KG/A== X-Gm-Message-State: AOAM530Od0JlDZ/3SFFcss/8RLgKrHTzXjvGlNTyQrYouzuDGNd6ARcC YTAFd2jt2O/eqehanK7pF8gjlpVjM9xOQzs+eg0Pvn/mLF2Ha7DZOmddSyk0y7al45haSBlm/Jg VLP2apfFpKBCIDhClTdgvOit17BeWtI5f8Lc= X-Received: by 2002:a9d:289:: with SMTP id 9mr14127915otl.10.1623086675884; Mon, 07 Jun 2021 10:24:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy0Mxu9OWeXq29nlPkEMpqQQx4J506+qxFfVHTsHRyJukzcKWG9aLTPxri3PNB8lw79Q0A/dw== X-Received: by 2002:a9d:289:: with SMTP id 9mr14127899otl.10.1623086675698; Mon, 07 Jun 2021 10:24:35 -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 15sm2409859oij.26.2021.06.07.10.24.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Jun 2021 10:24:35 -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 6/7] fpga: wrap the fpga_remove() op Date: Mon, 7 Jun 2021 10:24:01 -0700 Message-Id: <20210607172402.2938697-7-trix@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210607172402.2938697-1-trix@redhat.com> References: <20210607172402.2938697-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-20210607_102438_535502_CDB4D087 X-CRM114-Status: GOOD ( 11.79 ) 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 board is not required to provide a fpga_remove() op. Add a wrapper consistent with the other op wrappers. Move op check to wrapper. Signed-off-by: Tom Rix --- drivers/fpga/fpga-mgr.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c index d06752be9c6e..84808c7ca440 100644 --- a/drivers/fpga/fpga-mgr.c +++ b/drivers/fpga/fpga-mgr.c @@ -731,6 +731,12 @@ int fpga_mgr_register(struct fpga_manager *mgr) } EXPORT_SYMBOL_GPL(fpga_mgr_register); +static void fpga_mgr_fpga_remove(struct fpga_manager *mgr) +{ + if (mgr->mops && mgr->mops->fpga_remove) + mgr->mops->fpga_remove(mgr); +} + /** * fpga_mgr_unregister - unregister a FPGA manager * @mgr: fpga manager struct @@ -745,8 +751,7 @@ void fpga_mgr_unregister(struct fpga_manager *mgr) * If the low level driver provides a method for putting fpga into * a desired state upon unregister, do it. */ - if (mgr->mops->fpga_remove) - mgr->mops->fpga_remove(mgr); + fpga_mgr_fpga_remove(mgr); device_unregister(&mgr->dev); }