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 465CAC4727E for ; Sun, 4 Oct 2020 05:15:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 00B2E206DD for ; Sun, 4 Oct 2020 05:15:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601788521; bh=KNZF82YpQ1bErA9WZh2Moah8leIuU9WDY2Uu9rFFWQo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Nt0+xOtPw26ngRzU9hdr72aQ7DtIszYG98AnaGuT+Mi+TubZSazJtZViXhJxSeaKB 7Pe/+h6bPFAnrm7pzpOcbsMHHoTT1PGCKfG0rPmM56hdIeeS5VL7gSjIq832OmLn7C IuQSJLolLk/Pr+iJoWchR+4XpNvIZCIOi6vO/qT0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725974AbgJDFPT (ORCPT ); Sun, 4 Oct 2020 01:15:19 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:40890 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725866AbgJDFOz (ORCPT ); Sun, 4 Oct 2020 01:14:55 -0400 Received: by mail-pg1-f194.google.com with SMTP id q18so3611789pgk.7; Sat, 03 Oct 2020 22:14:55 -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=YHhb/VGZB3JzU7sTnLssu5Jr3MlGXPj+7Lz+7APODO4=; b=meaQnoxrohptcmHNyUC8uTsOZmmx0jHlD2E7BEQMOc31qJmv/v9g9pJeYxwUzBv2xa lcfboU6Qpw6x9n85MWpzdIF5lE+8McaRJwH/uVSP4IgMeVMM2Z37hbZ26nseX46o4vSE 4Qsd+i0f64+BVZPfblCxRf/RxsoMMbuf3H7TblM8ZTr9twBdB8XAhs4yfcR7HVcMpPab GOefpgEV4o0JHhjrfxX+6VmSLSFsiBs4ipWqyc4nfTISdzkWRrkaYQn1NtKV9QHzKTlk v/ct4jUti+nVtF68/kVkOzC6w619K8cHPEX2V+rRNsajs5jdin0e9iMw+IM5YjysHfQG vqAw== X-Gm-Message-State: AOAM532AuTOUWE9gjAxDcaIZRybfe8HgDZfuv+AhlYjoUTHD+Q0piHWM +iqW6phmIEhavESvoYPD3PLolkCTwuw= X-Google-Smtp-Source: ABdhPJypO3sAzA2yTYLx70pX8unTTAwZWlujyB1hECE+9ksvS4oO4ztuZCuq9g4bz+o+Q+Ekpx0doQ== X-Received: by 2002:a62:2b8d:0:b029:151:d7b8:ad58 with SMTP id r135-20020a622b8d0000b0290151d7b8ad58mr10508110pfr.51.1601788494519; Sat, 03 Oct 2020 22:14:54 -0700 (PDT) Received: from localhost ([2601:647:5b00:1161:a4cc:eef9:fbc0:2781]) by smtp.gmail.com with ESMTPSA id b16sm6189565pgj.77.2020.10.03.22.14.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Oct 2020 22:14:54 -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 06/10] fpga: fpga-mgr: socfpga: Simplify registration Date: Sat, 3 Oct 2020 22:14:19 -0700 Message-Id: <20201004051423.75879-7-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/socfpga.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/drivers/fpga/socfpga.c b/drivers/fpga/socfpga.c index 4a8a2fcd4e6c..1f467173fc1f 100644 --- a/drivers/fpga/socfpga.c +++ b/drivers/fpga/socfpga.c @@ -576,18 +576,7 @@ static int socfpga_fpga_probe(struct platform_device *pdev) if (!mgr) return -ENOMEM; - platform_set_drvdata(pdev, mgr); - - return fpga_mgr_register(mgr); -} - -static int socfpga_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); } #ifdef CONFIG_OF @@ -601,7 +590,6 @@ MODULE_DEVICE_TABLE(of, socfpga_fpga_of_match); static struct platform_driver socfpga_fpga_driver = { .probe = socfpga_fpga_probe, - .remove = socfpga_fpga_remove, .driver = { .name = "socfpga_fpga_manager", .of_match_table = of_match_ptr(socfpga_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 89509C4363D for ; Sun, 4 Oct 2020 05:16:37 +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 067AD2067B for ; Sun, 4 Oct 2020 05:16:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="cUa2pXIt" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 067AD2067B 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=msf3P2d+cRB5Cx7JLa7AJmj8CV+RjSJDKzjTB2Mress=; b=cUa2pXItruu/CLI+6zK+RlQs+ XzNY1Qb9wN+IDOwHYkrJYKolUX/k/C9qZ/sH/5oSmIyR5mCfZDDtMUSV+KP8HejNTwQpKCcdYGBLo dbaCWIZN8opL0+4MLm6JjzwG5Y49zIUmvVLxUfegjqLlC5iCK6KkK9OZwzaOLdVCIRvAGfq6izWTw NhGwQze6X5BWIPNyQZeSujrlVmmtAdoKJZqZT1lyQMQYzlL09Nwvzc/7BX3NFExDf5/O9RMZZ5gql KalgXLRwLg3NMVCGk8sPQBc6GF4M6IRKLPfZ/SwIebtR5+5Fnka7O7aVVpKY1ok5SENNtks+Xyk53 YDg+A7nTQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kOwMZ-0007Jd-Em; Sun, 04 Oct 2020 05:15:11 +0000 Received: from mail-pf1-f196.google.com ([209.85.210.196]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kOwMJ-0007Ed-Ls for linux-arm-kernel@lists.infradead.org; Sun, 04 Oct 2020 05:14:56 +0000 Received: by mail-pf1-f196.google.com with SMTP id d6so4306303pfn.9 for ; Sat, 03 Oct 2020 22:14:55 -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=YHhb/VGZB3JzU7sTnLssu5Jr3MlGXPj+7Lz+7APODO4=; b=r7vtEl0wxii5PQHsiKMAxqeveOaiHuY0OalBi4L+/mSspsJWuqFrfY/xP4dAvU9JLF PY+zWtCn7EhQC2AxqyNneXvD967ISxqIb8YuV88PPgmQ3/1217rinMVaLeuyJt31YBBq 9+iE5d6E4qQPKrcqVdBltbJnDdFYlSKNdSb+nu8gKiQGs3ZBaDO+53wG0HdMHTu9z5zl wsnh1jyFXG0QVRNvyUCeswr+86Z+WxxXhXKoq7KLvBI/Nej4Aag1/90dBSHdK65twQ2D wV0LseE9rF7OCQvcX2ExSdOZvX73imkWcTUHJTnxSxShUMqtFZ/VXvq64Dm00TOLmP5F sGgA== X-Gm-Message-State: AOAM532nvQV+MDKD523HoFMhHCo7YtJRLPH/Gb9sS7DBsj6wtrkB2Bhb f7CkBnqWR7pGFjdAp7WOsVM= X-Google-Smtp-Source: ABdhPJypO3sAzA2yTYLx70pX8unTTAwZWlujyB1hECE+9ksvS4oO4ztuZCuq9g4bz+o+Q+Ekpx0doQ== X-Received: by 2002:a62:2b8d:0:b029:151:d7b8:ad58 with SMTP id r135-20020a622b8d0000b0290151d7b8ad58mr10508110pfr.51.1601788494519; Sat, 03 Oct 2020 22:14:54 -0700 (PDT) Received: from localhost ([2601:647:5b00:1161:a4cc:eef9:fbc0:2781]) by smtp.gmail.com with ESMTPSA id b16sm6189565pgj.77.2020.10.03.22.14.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Oct 2020 22:14:54 -0700 (PDT) From: Moritz Fischer To: linux-fpga@vger.kernel.org Subject: [PATCH 06/10] fpga: fpga-mgr: socfpga: Simplify registration Date: Sat, 3 Oct 2020 22:14:19 -0700 Message-Id: <20201004051423.75879-7-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_011455_962301_83252F87 X-CRM114-Status: GOOD ( 13.75 ) 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/socfpga.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/drivers/fpga/socfpga.c b/drivers/fpga/socfpga.c index 4a8a2fcd4e6c..1f467173fc1f 100644 --- a/drivers/fpga/socfpga.c +++ b/drivers/fpga/socfpga.c @@ -576,18 +576,7 @@ static int socfpga_fpga_probe(struct platform_device *pdev) if (!mgr) return -ENOMEM; - platform_set_drvdata(pdev, mgr); - - return fpga_mgr_register(mgr); -} - -static int socfpga_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); } #ifdef CONFIG_OF @@ -601,7 +590,6 @@ MODULE_DEVICE_TABLE(of, socfpga_fpga_of_match); static struct platform_driver socfpga_fpga_driver = { .probe = socfpga_fpga_probe, - .remove = socfpga_fpga_remove, .driver = { .name = "socfpga_fpga_manager", .of_match_table = of_match_ptr(socfpga_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