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 592C7C4363C for ; Sun, 4 Oct 2020 05:15:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 26F622068E for ; Sun, 4 Oct 2020 05:15:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1601788516; bh=OLf9nj5gslxc5Y9rFE28gpvcy5T2xrJo9wj+ufRFRNM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=bXuBkVHAi3aGrDllRf9NlmBIAhVkFEl/vQ0TvQfplPUuaMkvVsznM0obF6gPLE0YC OtHtQg1idyT58YgWhHsMAB33BLB8IhRZYXosSGo7rOwe0RLPKjFb6UtHMu8rRTSKNP 9Kkw2sY9JJzc1DrenJWPCCtcdFXDxfQ6+ctJLgxo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725963AbgJDFPO (ORCPT ); Sun, 4 Oct 2020 01:15:14 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:37470 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725909AbgJDFO7 (ORCPT ); Sun, 4 Oct 2020 01:14:59 -0400 Received: by mail-pg1-f196.google.com with SMTP id h6so2939041pgk.4; Sat, 03 Oct 2020 22:14:57 -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=47sHf0OnbQAgrjSXH2UeNqKvTmvp8QgcUk98MlVaxRo=; b=lq74pZvFQlb+ayPtSk8QvjDtRmHy72G3lNtpV29wTEK8sOuW353HJOHLB6umHdyr6s YwqJ6fLX5AFAkyvoXPtcAt2IiJ8+d9D43j6KPTO+gDxMiECRsBcYjXM/JVt0R2/N1SVe whzneBilB7ZCglKcx6O038R+wO0c3aOIq+hn+ox2cyPPNTjdVnMDnE07BOsPfIZpxduN j/Y6mdZTkaCtVEInYw51LOI91iZo5vmnmMzdrCqysM7m0U2OMVm2b35KZ1pnkmvBeoVi sUIb6hgAVQmUSiM/3yAYdqb+BlUbP0RgGjDyy8WkqeaOf4LfOR1z6/ZBMk31to0ASde9 FyXg== X-Gm-Message-State: AOAM531LR6L8zN3EBi6ClK2Oq6uzaEcwNQDPQBrJaf3zfDnm6ynSf9FV PnCHyx/WFRX2LPdlk7YaORPAPzWyMec= X-Google-Smtp-Source: ABdhPJwvB3KaWGtsz2s+wyqr5IaazCnC6zzrFStHbeGJ/MYzvM7nhhvGhl36qlG0BApYbR1ts1mxsg== X-Received: by 2002:a62:1d06:0:b029:152:1b07:7e3b with SMTP id d6-20020a621d060000b02901521b077e3bmr10594286pfd.30.1601788496952; Sat, 03 Oct 2020 22:14:56 -0700 (PDT) Received: from localhost ([2601:647:5b00:1161:a4cc:eef9:fbc0:2781]) by smtp.gmail.com with ESMTPSA id 5sm4505745pfg.152.2020.10.03.22.14.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Oct 2020 22:14:56 -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 08/10] fpga: fpga-mgr: xilinx-spi: Simplify registration Date: Sat, 3 Oct 2020 22:14:21 -0700 Message-Id: <20201004051423.75879-9-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/xilinx-spi.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/drivers/fpga/xilinx-spi.c b/drivers/fpga/xilinx-spi.c index 824abbbd631e..27defa98092d 100644 --- a/drivers/fpga/xilinx-spi.c +++ b/drivers/fpga/xilinx-spi.c @@ -259,18 +259,7 @@ static int xilinx_spi_probe(struct spi_device *spi) if (!mgr) return -ENOMEM; - spi_set_drvdata(spi, mgr); - - return fpga_mgr_register(mgr); -} - -static int xilinx_spi_remove(struct spi_device *spi) -{ - struct fpga_manager *mgr = spi_get_drvdata(spi); - - fpga_mgr_unregister(mgr); - - return 0; + return devm_fpga_mgr_register(&spi->dev, mgr); } static const struct of_device_id xlnx_spi_of_match[] = { @@ -285,7 +274,6 @@ static struct spi_driver xilinx_slave_spi_driver = { .of_match_table = of_match_ptr(xlnx_spi_of_match), }, .probe = xilinx_spi_probe, - .remove = xilinx_spi_remove, }; module_spi_driver(xilinx_slave_spi_driver) -- 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 5B3DAC4727F for ; Sun, 4 Oct 2020 05:16:42 +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 087812067B for ; Sun, 4 Oct 2020 05:16:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="AUQvFRaE" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 087812067B 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=lJvEUg33bXbh20owsKD0lk5tKLnVVqe2Ye+1IeNhjz8=; b=AUQvFRaEgKFnQpFBoQL7n31rY qwnDvwDa81wZHmOoII2t5/FT6Dp3oer78g9b5MVhFwd3qmGu/gJFbfdl/rHixbT/0fwOX24RX4qwX Vg1PY1DANvs4utrxtb9n6W0ROJlChOwUrZ0/J14rFA6gDOwl6R+2RamnHKLZhItMGDpYU6COz5BX+ olSenp5Knk5nHtacpFwzyMn1gEJYr4X6I7BOzUXVMkJyEr1nqCoJHr32lyJFjJ5twnjx7DQoHGXCx j+QwIhAUPSXA9xFYW3qNrjxxLK+4N/YkjloatesFa+ml/QIssTofcrM9MXjZZ8j72prhFBrbEtsxI uGmXdjDCQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kOwMe-0007Kx-KL; Sun, 04 Oct 2020 05:15:16 +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 1kOwML-0007Fe-KK for linux-arm-kernel@lists.infradead.org; Sun, 04 Oct 2020 05:14:58 +0000 Received: by mail-pf1-f196.google.com with SMTP id d6so4306346pfn.9 for ; Sat, 03 Oct 2020 22:14:57 -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=47sHf0OnbQAgrjSXH2UeNqKvTmvp8QgcUk98MlVaxRo=; b=isxkl954fqVOTmFjKbfZdgnl4QL7IT2SBh4CCMBlgy4RM/WunVTgBq7g03q+z4SygC KCoXFBo3ysPAmTVUTPv1WV4Ij9fqvRkbkb4/bEO6LzHDpxe/WUUxYxjCktrb8x0NFGIb FPNYpv0+aC3c/wpPUb9pjou+wlLjPci5Wd5UaJDf3UOPrXMssF1JZlBRXpZ0rJlTUMLD AOl02oPccdWjL4JmgpH5PpY9CnTl54ZxOAJJyCSNGwP5vJFo6LMOcxAJ5eLwmx4To3k0 SVU79suaR9OEjAeOSV8GSD7ptqzznFWmb0c5nk9cOFhx171ggo9KusWEDPJhlp5vj6y/ dJVg== X-Gm-Message-State: AOAM5334ThZmZpr4ahgdv6WI+1AcJp+F+q0lfb1p+bYLiQLDOvXZD0A+ 5/ICLkk6fbwfAqZtt5maJCo= X-Google-Smtp-Source: ABdhPJwvB3KaWGtsz2s+wyqr5IaazCnC6zzrFStHbeGJ/MYzvM7nhhvGhl36qlG0BApYbR1ts1mxsg== X-Received: by 2002:a62:1d06:0:b029:152:1b07:7e3b with SMTP id d6-20020a621d060000b02901521b077e3bmr10594286pfd.30.1601788496952; Sat, 03 Oct 2020 22:14:56 -0700 (PDT) Received: from localhost ([2601:647:5b00:1161:a4cc:eef9:fbc0:2781]) by smtp.gmail.com with ESMTPSA id 5sm4505745pfg.152.2020.10.03.22.14.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Oct 2020 22:14:56 -0700 (PDT) From: Moritz Fischer To: linux-fpga@vger.kernel.org Subject: [PATCH 08/10] fpga: fpga-mgr: xilinx-spi: Simplify registration Date: Sat, 3 Oct 2020 22:14:21 -0700 Message-Id: <20201004051423.75879-9-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_011457_731413_BB556BCE X-CRM114-Status: GOOD ( 13.64 ) 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/xilinx-spi.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/drivers/fpga/xilinx-spi.c b/drivers/fpga/xilinx-spi.c index 824abbbd631e..27defa98092d 100644 --- a/drivers/fpga/xilinx-spi.c +++ b/drivers/fpga/xilinx-spi.c @@ -259,18 +259,7 @@ static int xilinx_spi_probe(struct spi_device *spi) if (!mgr) return -ENOMEM; - spi_set_drvdata(spi, mgr); - - return fpga_mgr_register(mgr); -} - -static int xilinx_spi_remove(struct spi_device *spi) -{ - struct fpga_manager *mgr = spi_get_drvdata(spi); - - fpga_mgr_unregister(mgr); - - return 0; + return devm_fpga_mgr_register(&spi->dev, mgr); } static const struct of_device_id xlnx_spi_of_match[] = { @@ -285,7 +274,6 @@ static struct spi_driver xilinx_slave_spi_driver = { .of_match_table = of_match_ptr(xlnx_spi_of_match), }, .probe = xilinx_spi_probe, - .remove = xilinx_spi_remove, }; module_spi_driver(xilinx_slave_spi_driver) -- 2.28.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel