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=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 17613C4743C for ; Wed, 23 Jun 2021 18:24:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EB328610F7 for ; Wed, 23 Jun 2021 18:24:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229850AbhFWS0q (ORCPT ); Wed, 23 Jun 2021 14:26:46 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:33914 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229523AbhFWS0q (ORCPT ); Wed, 23 Jun 2021 14:26:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1624472668; 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=Htp54BK0JGPxX8hRg4+dCEnU8CurZfr6H6uRpE1E1JA=; b=a9h9CEsznQ5V09qJkZYnvR3LnaW9uTQNlBEFuxPbZluEcj3+LPORwCm9xhCDzcVHdnxLkU pjPmNPhzqb0jSqvjskhz9bzjfRGyEVDEuLNu+FPkthEXY37UoNOmjP8pCrwJQHkIm1GxcT weUInZeF7MlnalknkyfyyRaaO81BfYs= 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-229-gTAIAo4kMrC6D2dRjA7OgA-1; Wed, 23 Jun 2021 14:24:26 -0400 X-MC-Unique: gTAIAo4kMrC6D2dRjA7OgA-1 Received: by mail-oi1-f197.google.com with SMTP id b185-20020acab2c20000b02901f6dd5f89fbso2244256oif.10 for ; Wed, 23 Jun 2021 11:24:26 -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=Htp54BK0JGPxX8hRg4+dCEnU8CurZfr6H6uRpE1E1JA=; b=BUqQgmZZlcMNew/t681lgACP6aCY77jtz+Pu7abDuLdtw8x0RhghrssmOprCgmM1Hb G2b+C9eEP7OzG+YaV60Kk9DHBLE8Zni40hINb31YCnUek0JK5Ts9JK/9LNtIoynuY++O hju/NdCXM/sG1T6s7yKu0s+0TqP3nPSWRXR5k3vvUB3bhVRVh06TI4EaKg2yJjDQJAlt Iz/+fk7pi/wwb3fkYVHd8w91zR8RdzXB1aInudGgXZkGlc2cfegw8LgB7WKVG4Z46gab rQRSzcgPwDB/j/zlDYabmvkgUk2Fe5464T4QXpYhvvQDAuQS+XV2v9hLBoKoQU+T1/20 OwFg== X-Gm-Message-State: AOAM533905PHu02qwBdabxsUUixrtFqK9RZmpHHPVULEv5Bg9ksKEKD/ Ek6PcZOJ95rfbtKBl4lF5+emFB1POAecNvAuiu5/a3QDS+DLNMPifbmAeagbW+P05bAM7NsuVuH cpd+ywWL1STt1MdIiA0lFYQ== X-Received: by 2002:a9d:4006:: with SMTP id m6mr1091544ote.130.1624472666218; Wed, 23 Jun 2021 11:24:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxF6Hb/fcM8IvALNCl6D5hK6kIQQYZrMClGzUljQpEiNs53aD0YD3Vsj5TzZ9p5+6KcUhipMQ== X-Received: by 2002:a9d:4006:: with SMTP id m6mr1091530ote.130.1624472666056; Wed, 23 Jun 2021 11:24:26 -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.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jun 2021 11:24:25 -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 1/7] fpga-mgr: wrap the write_init() op Date: Wed, 23 Jun 2021 11:24:04 -0700 Message-Id: <20210623182410.3787784-3-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 should not be required to provide a write_init() op if there is nothing for it do. So add a wrapper and move the op checking. Default to success. Signed-off-by: Tom Rix --- drivers/fpga/fpga-mgr.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/fpga/fpga-mgr.c b/drivers/fpga/fpga-mgr.c index ecb4c3c795fa5..87bbb940c9504 100644 --- a/drivers/fpga/fpga-mgr.c +++ b/drivers/fpga/fpga-mgr.c @@ -69,6 +69,14 @@ void fpga_image_info_free(struct fpga_image_info *info) } EXPORT_SYMBOL_GPL(fpga_image_info_free); +static int fpga_mgr_write_init(struct fpga_manager *mgr, + struct fpga_image_info *info, + const char *buf, size_t count) +{ + if (mgr->mops && mgr->mops->write_init) + return mgr->mops->write_init(mgr, info, buf, count); + return 0; +} /* * Call the low level driver's write_init function. This will do the * device-specific things to get the FPGA into the state where it is ready to @@ -83,9 +91,9 @@ static int fpga_mgr_write_init_buf(struct fpga_manager *mgr, mgr->state = FPGA_MGR_STATE_WRITE_INIT; if (!mgr->mops->initial_header_size) - ret = mgr->mops->write_init(mgr, info, NULL, 0); + ret = fpga_mgr_write_init(mgr, info, NULL, 0); else - ret = mgr->mops->write_init( + ret = fpga_mgr_write_init( mgr, info, buf, min(mgr->mops->initial_header_size, count)); if (ret) { @@ -569,7 +577,7 @@ struct fpga_manager *fpga_mgr_create(struct device *parent, const char *name, int id, ret; if (!mops || !mops->write_complete || !mops->state || - !mops->write_init || (!mops->write && !mops->write_sg) || + (!mops->write && !mops->write_sg) || (mops->write && mops->write_sg)) { dev_err(parent, "Attempt to register without fpga_manager_ops\n"); return NULL; -- 2.26.3