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=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 2ECFDC4727D for ; Sun, 4 Oct 2020 05:15:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DE9022068E for ; Sun, 4 Oct 2020 05:15:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601788512; bh=hl9/Vlz0IhknUFLHFYxD/tIyDrJA6JyrOa4kBFuagFI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=IV67eE1Iahm0hfWMOqnb8F+gML+dQvTno5chMvCdkzo2/eLYmSS49qj1+Qp0Ns14Q l1+pNgx63fCJInW5iTDhj3vJ702LiAH3pT3wnWnkBUD9E4h+acy7kJewy3FCOkJ+ld zfJ2oqLMD4GCthe1JUFE5mMT7wrETE1snMkFpAO0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725946AbgJDFPL (ORCPT ); Sun, 4 Oct 2020 01:15:11 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:40898 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725908AbgJDFO7 (ORCPT ); Sun, 4 Oct 2020 01:14:59 -0400 Received: by mail-pg1-f195.google.com with SMTP id q18so3611843pgk.7; Sat, 03 Oct 2020 22:14:58 -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=l0sL7ADN3Hq+42GWHoUqJqayEjL3b9dF3MMfLH2Y9NQ=; b=PATbyoXhYorfgAaoW8mhSBodjDeQNLFjr5yoL5BT8gJRMVQE+ANAgrB++A6xjkiQIG 99pUIaEbhpO0vqB+IulDqZHqUJ52ntMb6fQQdXFmoLFO/0zGgsK/4n8Ac4RZZlv1Hh4S Tr00q5B1Jm9oTkVTHGSQFTdlnZ/pj3JA0jmKdI943b4OomoUcPLh+HkK++Q02o9BX0b6 mOXn+/+BmjnMADHkhN4ALqx3oh58duC+5tUBlTgkHH6BFD35xW82jMGdoC5rklWNSgjf SUyYMa6exx5OgjQSKURlzubR+VGSPuRB3CNBAUuuP6qGpzjyhtb5VPdW0O8EQKu+hAsA AV7w== X-Gm-Message-State: AOAM532oJ0Sc7fO6Vn51G722VRFfXUwOwc2ximJ/NnfkjuNnsn9UbiAL 0yrxxFGQBLFbaLuzjNAIH3gSd9qNRaY= X-Google-Smtp-Source: ABdhPJzFayjCJtOlCCDp1euNS+8aBlvXNaFrFBJ5JLikW0r8Gujg+MhK1dPOtDj2wkEnQuwZAH6iVA== X-Received: by 2002:a63:1958:: with SMTP id 24mr8687000pgz.326.1601788498162; Sat, 03 Oct 2020 22:14:58 -0700 (PDT) Received: from localhost ([2601:647:5b00:1161:a4cc:eef9:fbc0:2781]) by smtp.gmail.com with ESMTPSA id x6sm6145100pjp.25.2020.10.03.22.14.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Oct 2020 22:14:57 -0700 (PDT) From: Moritz Fischer To: linux-fpga@vger.kernel.org Cc: trix@redhat.com, hao.wu@intel.com, michal.simek@xilinx.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, russell.h.weight@intel.com, matthew.gerlach@intel.com, Moritz Fischer Subject: [PATCH 09/10] fpga: fpga-mgr: zynqmp: Simplify registration Date: Sat, 3 Oct 2020 22:14:22 -0700 Message-Id: <20201004051423.75879-10-mdf@kernel.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201004051423.75879-1-mdf@kernel.org> References: <20201004051423.75879-1-mdf@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Simplify registration using new devm_fpga_mgr_register() API. Signed-off-by: Moritz Fischer --- drivers/fpga/zynqmp-fpga.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/drivers/fpga/zynqmp-fpga.c b/drivers/fpga/zynqmp-fpga.c index 4a1139e05280..125743c9797f 100644 --- a/drivers/fpga/zynqmp-fpga.c +++ b/drivers/fpga/zynqmp-fpga.c @@ -95,7 +95,6 @@ static int zynqmp_fpga_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; struct zynqmp_fpga_priv *priv; struct fpga_manager *mgr; - int ret; priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); if (!priv) @@ -108,24 +107,7 @@ static int zynqmp_fpga_probe(struct platform_device *pdev) if (!mgr) return -ENOMEM; - platform_set_drvdata(pdev, mgr); - - ret = fpga_mgr_register(mgr); - if (ret) { - dev_err(dev, "unable to register FPGA manager"); - return ret; - } - - return 0; -} - -static int zynqmp_fpga_remove(struct platform_device *pdev) -{ - struct fpga_manager *mgr = platform_get_drvdata(pdev); - - fpga_mgr_unregister(mgr); - - return 0; + return devm_fpga_mgr_register(dev, mgr); } static const struct of_device_id zynqmp_fpga_of_match[] = { @@ -137,7 +119,6 @@ MODULE_DEVICE_TABLE(of, zynqmp_fpga_of_match); static struct platform_driver zynqmp_fpga_driver = { .probe = zynqmp_fpga_probe, - .remove = zynqmp_fpga_remove, .driver = { .name = "zynqmp_fpga_manager", .of_match_table = of_match_ptr(zynqmp_fpga_of_match), -- 2.28.0 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=-13.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 B8179C4727D for ; Sun, 4 Oct 2020 05:16:43 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 59D112067C for ; Sun, 4 Oct 2020 05:16:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="PONvyeAz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 59D112067C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org 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=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=Z9nDbsKNqI+4DgaR+p2caESkK1su7t/Mf4A/zHxX+MA=; b=PONvyeAzyQx+KehvcnOAXdYhc 93Gi/gigIXPlNXrn/zAcXv5Cgo37rerR83hwyzoa5hF32KUQMAcByBzdFKGppyNkXVZkjOn1lU8e3 +ynZ5QF3tARadB8J+YEH3EGorCABmrBrfb48yH7fnprRS0i8Fs0ZIwEKz3OwyIWbvXqH0FNnDHpch BYOaugTXy55iZJ/JqJYu+93SN5Yt6F+w/HOF36/3ak6DKOhGGagq3fQ56NqNEzzGu61oBbUx18uWi PJHuJIPgdkkl6MgCY4QokgPH1bi6K/P5DxUl4CHZAgESFCLH6VgZ2iIv9wO6CTAVIxuFu1c3J2ECm k8v682rmQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kOwMg-0007LY-Ni; Sun, 04 Oct 2020 05:15:18 +0000 Received: from mail-pf1-f194.google.com ([209.85.210.194]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kOwMN-0007GD-6i for linux-arm-kernel@lists.infradead.org; Sun, 04 Oct 2020 05:15:00 +0000 Received: by mail-pf1-f194.google.com with SMTP id d6so4306358pfn.9 for ; Sat, 03 Oct 2020 22:14:58 -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=l0sL7ADN3Hq+42GWHoUqJqayEjL3b9dF3MMfLH2Y9NQ=; b=q5HcA+1N6CcLCw3M5CHDvEp4wLfsFT7FlL/Lq8F0BQxiSCAqMWk71t3VvMi5Eyqd0f Y1Jsame7jYqDa124C3cW03y3rmXpNl0BCyb1e0F6WVL1fVX6sLDfD4b7hZ7zNU7YWfan 3ouXqEX3Mc4hgcKG23dEupa6h0f+7R6RASvmPDq0hOac6AkmfS6kMFw6h6JFFlnq9BIx 2Oq/hTY0QMvqbM6Olz11jOeowjTYy5Flscl2Xa1/x76OkE3+4AyPyiPM6A14x0TrAx5G b8WsvodbQWDnPURvV2UOWJPcQFv6QfUD4iLN9IyDe2JbvUPNP/5B5VqQ3HmTCUxKKCuU WGfw== X-Gm-Message-State: AOAM532JrxVMyB5ktalkhCdGfRr8zxDNNkza132IxwdLyyYMASZfIJMs TRSyof/znwWnvQb0r+e8xM1iUD4fRis= X-Google-Smtp-Source: ABdhPJzFayjCJtOlCCDp1euNS+8aBlvXNaFrFBJ5JLikW0r8Gujg+MhK1dPOtDj2wkEnQuwZAH6iVA== X-Received: by 2002:a63:1958:: with SMTP id 24mr8687000pgz.326.1601788498162; Sat, 03 Oct 2020 22:14:58 -0700 (PDT) Received: from localhost ([2601:647:5b00:1161:a4cc:eef9:fbc0:2781]) by smtp.gmail.com with ESMTPSA id x6sm6145100pjp.25.2020.10.03.22.14.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Oct 2020 22:14:57 -0700 (PDT) From: Moritz Fischer To: linux-fpga@vger.kernel.org Subject: [PATCH 09/10] fpga: fpga-mgr: zynqmp: Simplify registration Date: Sat, 3 Oct 2020 22:14:22 -0700 Message-Id: <20201004051423.75879-10-mdf@kernel.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201004051423.75879-1-mdf@kernel.org> References: <20201004051423.75879-1-mdf@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201004_011459_266761_E34D3F43 X-CRM114-Status: GOOD ( 15.27 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: russell.h.weight@intel.com, trix@redhat.com, michal.simek@xilinx.com, matthew.gerlach@intel.com, linux-kernel@vger.kernel.org, Moritz Fischer , linux-arm-kernel@lists.infradead.org, hao.wu@intel.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Simplify registration using new devm_fpga_mgr_register() API. Signed-off-by: Moritz Fischer --- drivers/fpga/zynqmp-fpga.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/drivers/fpga/zynqmp-fpga.c b/drivers/fpga/zynqmp-fpga.c index 4a1139e05280..125743c9797f 100644 --- a/drivers/fpga/zynqmp-fpga.c +++ b/drivers/fpga/zynqmp-fpga.c @@ -95,7 +95,6 @@ static int zynqmp_fpga_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; struct zynqmp_fpga_priv *priv; struct fpga_manager *mgr; - int ret; priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); if (!priv) @@ -108,24 +107,7 @@ static int zynqmp_fpga_probe(struct platform_device *pdev) if (!mgr) return -ENOMEM; - platform_set_drvdata(pdev, mgr); - - ret = fpga_mgr_register(mgr); - if (ret) { - dev_err(dev, "unable to register FPGA manager"); - return ret; - } - - return 0; -} - -static int zynqmp_fpga_remove(struct platform_device *pdev) -{ - struct fpga_manager *mgr = platform_get_drvdata(pdev); - - fpga_mgr_unregister(mgr); - - return 0; + return devm_fpga_mgr_register(dev, mgr); } static const struct of_device_id zynqmp_fpga_of_match[] = { @@ -137,7 +119,6 @@ MODULE_DEVICE_TABLE(of, zynqmp_fpga_of_match); static struct platform_driver zynqmp_fpga_driver = { .probe = zynqmp_fpga_probe, - .remove = zynqmp_fpga_remove, .driver = { .name = "zynqmp_fpga_manager", .of_match_table = of_match_ptr(zynqmp_fpga_of_match), -- 2.28.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel