From patchwork Wed Dec 4 09:53:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 11272651 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7D15214B7 for ; Wed, 4 Dec 2019 09:54:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 59D95206DB for ; Wed, 4 Dec 2019 09:54:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ZgK2xpmm" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726166AbfLDJyU (ORCPT ); Wed, 4 Dec 2019 04:54:20 -0500 Received: from mail-pl1-f193.google.com ([209.85.214.193]:47084 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726632AbfLDJyT (ORCPT ); Wed, 4 Dec 2019 04:54:19 -0500 Received: by mail-pl1-f193.google.com with SMTP id k20so2947695pll.13; Wed, 04 Dec 2019 01:54:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=Yr7ow8GTmJkAHzIYaMaQkuIE5TitlU69AapCYxHxDps=; b=ZgK2xpmmM4E1oWxKp3+/qAKtBGSlbVVCWrUvmWrSxqA8uCqUkHarbkgrW5pREnEz7q rt6GcAQ1G93LP6ZCk+9sS0X5Re1mS5EYwZz1fmK638M6EBGMCv9cnDxTc0SKJJ+RU6mU ponjciEPdNGyVa5aeUb2RANsByGMFmPefMO4nY2m3g2P3Tw2MuPTVJmK7Qd1gaAr8eij UGPdVhbqPGizjDkxglfo66j3Pcwsk2z9WdRG3wanX+H7HOHJghV+bceEKNdKklhSh4pV /g1Tzi1WaH29Nzu1nR0XHmxmNPkLV50GAbW4SIq5WbLALNOaWH+30UkbppuSZ46JSzV7 rbfg== 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:in-reply-to:references; bh=Yr7ow8GTmJkAHzIYaMaQkuIE5TitlU69AapCYxHxDps=; b=A6d1B+fatywD70XfKF/NltqOK0UDXTrW1W5ePL5bxRqyzlk9TJEg8NcJzmmn5xgnOo NUIyNMN6Y3MDjxHS7ON/JAAyCpphLhHbwlfqO31MG0WUlQkfqg+zinPma2mjj3vyi95y Dz01iA5SsBoJeMiQ5ERtCa0N8Ckl6pYhgrBA6B6Ew185/7bOFHg0Oe1a9X1af5Ii0buG jcaD1Bw/AeNOPlRHAisrkTXng8h1mFZ2bG+r9cq9exT95hFGvVMA+FBeslCyfHpQylA0 /50IvCfWMSkEtwSjq7hz5v0fJ+SNdopad3fvSTyxWCeloVlaY/qDeGdtZfbbqcdat6qK MMRw== X-Gm-Message-State: APjAAAXf/67Rqe+9aFUcx8Z5gSgxfuhQaBswncwXlQWIZWWnS4q8SIiY GkLt9mPNeQnt7vQAExVIoiQ= X-Google-Smtp-Source: APXvYqy3g3wzo53GR/iSw5diEUdMACLnabPEltuTjdGhFohSu+l6XqI9adpeV2ZgFypPKZYZ2aofYg== X-Received: by 2002:a17:90a:8a8d:: with SMTP id x13mr2323336pjn.97.1575453259348; Wed, 04 Dec 2019 01:54:19 -0800 (PST) Received: from baolinwangubtpc.spreadtrum.com ([117.18.48.82]) by smtp.gmail.com with ESMTPSA id k101sm5941687pjb.5.2019.12.04.01.54.16 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Dec 2019 01:54:18 -0800 (PST) From: Baolin Wang To: ohad@wizery.com, bjorn.andersson@linaro.org, baohua@kernel.org Cc: linux-arm-kernel@lists.infradead.org, baolin.wang7@gmail.com, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] hwspinlock: sirf: Change to use devm_platform_ioremap_resource() Date: Wed, 4 Dec 2019 17:53:31 +0800 Message-Id: <812aba62d4f0c1b460a7fb89b165664dde2795a6.1575452516.git.baolin.wang7@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: In-Reply-To: References: Sender: linux-remoteproc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org Use the new helper that wraps the calls to platform_get_resource() and devm_ioremap_resource() together, which can simpify the code. Signed-off-by: Baolin Wang --- drivers/hwspinlock/sirf_hwspinlock.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/hwspinlock/sirf_hwspinlock.c b/drivers/hwspinlock/sirf_hwspinlock.c index 1f625cd..8cb5fd4 100644 --- a/drivers/hwspinlock/sirf_hwspinlock.c +++ b/drivers/hwspinlock/sirf_hwspinlock.c @@ -69,9 +69,9 @@ static int sirf_hwspinlock_probe(struct platform_device *pdev) return -ENOMEM; /* retrieve io base */ - hwspin->io_base = of_iomap(pdev->dev.of_node, 0); - if (!hwspin->io_base) - return -ENOMEM; + hwspin->io_base = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(hwspin->io_base)) + return PTR_ERR(hwspin->io_base); for (idx = 0; idx < HW_SPINLOCK_NUMBER; idx++) { hwlock = &hwspin->bank.lock[idx]; @@ -92,7 +92,6 @@ static int sirf_hwspinlock_probe(struct platform_device *pdev) reg_failed: pm_runtime_disable(&pdev->dev); - iounmap(hwspin->io_base); return ret; } @@ -110,8 +109,6 @@ static int sirf_hwspinlock_remove(struct platform_device *pdev) pm_runtime_disable(&pdev->dev); - iounmap(hwspin->io_base); - return 0; } From patchwork Wed Dec 4 09:53:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 11272649 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1BF5814B7 for ; Wed, 4 Dec 2019 09:54:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EC8EA206DB for ; Wed, 4 Dec 2019 09:54:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gEVEszU2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726893AbfLDJyX (ORCPT ); Wed, 4 Dec 2019 04:54:23 -0500 Received: from mail-pg1-f194.google.com ([209.85.215.194]:34706 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726632AbfLDJyW (ORCPT ); Wed, 4 Dec 2019 04:54:22 -0500 Received: by mail-pg1-f194.google.com with SMTP id r11so3140470pgf.1; Wed, 04 Dec 2019 01:54:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=aTQ2WmgfLL0RKpED5qehF/7+sveySkG+bgQJgoV8etc=; b=gEVEszU2rEO5LtTSee+SJLa3xwahRpVX4g6r+WflHC3GAFzlRrmEM9Q1ZDYtBB00Fp YFoDyVLMsRLp1zs30FyWG+R7Spwx9P8aLkS22Bxn8YgE2vmWnrzBRX6ONYFXdiXtQrNW kq6AcXEpC1cejcu75sVx5iMahZ4S7ofWBJ5sYLFES59HA4ieJetY3argbcBJbiaVTGK8 kwpOQlj0e9y9/wwmANAEHPjVm3vXD1vhOxZpo321ZCkVRObxd3NK/G1aoOH7TN/ow8lp FkJvGs0SWJlRPMEmM9iV4fpg58wv96RGZr1XYi1Rb32RWPxDa0oVQ7g6fyKKajVq2x7H tTOw== 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:in-reply-to:references; bh=aTQ2WmgfLL0RKpED5qehF/7+sveySkG+bgQJgoV8etc=; b=YoGd2vrcbNLbXnC9Oz0FHo44vknHYe635Clu8DRX1vxH5AHpw7zc15rBkCiiRC4bXe XLgw/JHXr6Tx13QG1/5F0xzNO/ErlqpTTNZQFpsbDoZS04lFEG6KpBd4gfEoZP5nAeXY oAtYFtDlF/4DftBaRnYzOxug/YTM6NN0KZ9F6HIlKsVW1pSpeKuJf+mEs2N4kUNr6+Fx n5+n4vurFYdeycMWDnYlpsX024xSuALFHo2V1mh4N8T41h9VBuqgWpJyEgHMMC3uquL7 EVqm1q+el+q28NgqwvcjJYffJ5IZkhk43hPeEIW5KVVqAychC7RDeU9xXJ/oETwyctjQ yifg== X-Gm-Message-State: APjAAAVZQmK9lc5OLI74Je3aQJWZi4bltZHC50+cITwOsG63J7P+NgEg azb6g3VWXsfLA0pOlVsJsmc= X-Google-Smtp-Source: APXvYqxl5TYVfNvBXy/dz9DmCKkQnMlInal4tLsT88gN5/HW47YmGT1ZDLDexAyox8Jsc6xH/LByBw== X-Received: by 2002:a63:f04e:: with SMTP id s14mr2667068pgj.30.1575453261840; Wed, 04 Dec 2019 01:54:21 -0800 (PST) Received: from baolinwangubtpc.spreadtrum.com ([117.18.48.82]) by smtp.gmail.com with ESMTPSA id k101sm5941687pjb.5.2019.12.04.01.54.19 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Dec 2019 01:54:21 -0800 (PST) From: Baolin Wang To: ohad@wizery.com, bjorn.andersson@linaro.org, baohua@kernel.org Cc: linux-arm-kernel@lists.infradead.org, baolin.wang7@gmail.com, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] hwspinlock: sirf: Remove redundant PM runtime functions Date: Wed, 4 Dec 2019 17:53:32 +0800 Message-Id: <222255194cd40b48a0ec2b7e351eda0983b38acc.1575452516.git.baolin.wang7@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: In-Reply-To: References: Sender: linux-remoteproc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org Since the hwspinlock core has changed the PM runtime to be optional, and the SIRF hardware spinlock has no pm runtime requirement, thus remove these redundant PM runtime functions. Signed-off-by: Baolin Wang --- drivers/hwspinlock/sirf_hwspinlock.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/drivers/hwspinlock/sirf_hwspinlock.c b/drivers/hwspinlock/sirf_hwspinlock.c index 8cb5fd4..d62462e 100644 --- a/drivers/hwspinlock/sirf_hwspinlock.c +++ b/drivers/hwspinlock/sirf_hwspinlock.c @@ -9,7 +9,6 @@ #include #include #include -#include #include #include #include @@ -56,7 +55,7 @@ static int sirf_hwspinlock_probe(struct platform_device *pdev) { struct sirf_hwspinlock *hwspin; struct hwspinlock *hwlock; - int idx, ret; + int idx; if (!pdev->dev.of_node) return -ENODEV; @@ -80,20 +79,9 @@ static int sirf_hwspinlock_probe(struct platform_device *pdev) platform_set_drvdata(pdev, hwspin); - pm_runtime_enable(&pdev->dev); - - ret = hwspin_lock_register(&hwspin->bank, &pdev->dev, - &sirf_hwspinlock_ops, 0, - HW_SPINLOCK_NUMBER); - if (ret) - goto reg_failed; - - return 0; - -reg_failed: - pm_runtime_disable(&pdev->dev); - - return ret; + return hwspin_lock_register(&hwspin->bank, &pdev->dev, + &sirf_hwspinlock_ops, 0, + HW_SPINLOCK_NUMBER); } static int sirf_hwspinlock_remove(struct platform_device *pdev) @@ -107,8 +95,6 @@ static int sirf_hwspinlock_remove(struct platform_device *pdev) return ret; } - pm_runtime_disable(&pdev->dev); - return 0; } From patchwork Wed Dec 4 09:53:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 11272653 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 45E6214B7 for ; Wed, 4 Dec 2019 09:54:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 22282206DB for ; Wed, 4 Dec 2019 09:54:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CqEjAqBZ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727009AbfLDJy2 (ORCPT ); Wed, 4 Dec 2019 04:54:28 -0500 Received: from mail-pg1-f195.google.com ([209.85.215.195]:34730 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726632AbfLDJyZ (ORCPT ); Wed, 4 Dec 2019 04:54:25 -0500 Received: by mail-pg1-f195.google.com with SMTP id r11so3140563pgf.1; Wed, 04 Dec 2019 01:54:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=lK0hzpi7lOKx/+vwwnIUmfL08coFZ79d+GQbKJpzbuw=; b=CqEjAqBZI2DYUBa0fTauRtHIY9p7Cyi3RlaTmg430JUBYj9ae2a90oUMiq04AsaKEb FJ/CvBZHMW0we9ND+ppTbh7a8jhOz8Ce6oowvzKhqXBTYcof1eDT4TYvV1G14vfnU+oF jWagkHpYSNVBn0HFZNE778WdHRIYPIlM+zUQScXvOKqTc0LHMnjd+rP6uT/B5i6b6Rhx vMlG2tNtuQ6idKDd4XOKTw2O42qnCff69KiICKuapSSsFi/5VciM+9Q1nVq5ui1yrKUg D9hy4Ir9b3g/x/F8rpLcOagASOykjRa8emkQGiy02pA7bc+cTS9mGUHt8pcCXl1ZztgS sydg== 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:in-reply-to:references; bh=lK0hzpi7lOKx/+vwwnIUmfL08coFZ79d+GQbKJpzbuw=; b=Ur8sqivKB/M90qi4hWl7An6s9a+ZJjXsqzTPh4dgyL5jXCrHxnGStG8dK0B9EjdggB jUJGE7+bEQjJhDhiyb4WdLMaaYcmvBJIzLX0uQQ86YnWoUmIfrid8mfkN+t7mu1m+Uh6 mFNhuZfZvDpaVwgiIejWOApDiabhNgwrhiLp33nKSRBUCVhkc98NaKN5FC1N0kAgM2XH 8j5UzDUIBKIj7aPUxJrCoRaUdvw16NcPquIQlyimQJsUsVmuyk132sIiKwOMx0Yvvt23 HoB4tMA4qZtbkLlwLcqXrhiLODASZtgOPlFC7WNmmLLvr4TFE6WI/KEngJ0U76aON23t NWAw== X-Gm-Message-State: APjAAAWwWj3TagBi0Oj3sKskmpyxLLk6nnytkfnhgdwfF4vrUDkR6kMQ 8/OxbRwPleWTtEJ0s6b6BKg= X-Google-Smtp-Source: APXvYqwj9EAIod5rI0TjevWy7FOFw+DSgYt6tnRhZdS6CK05vlUb7uUJci/Lp8NvAuIprbHSMdUe1Q== X-Received: by 2002:a63:7d6:: with SMTP id 205mr2613550pgh.131.1575453264820; Wed, 04 Dec 2019 01:54:24 -0800 (PST) Received: from baolinwangubtpc.spreadtrum.com ([117.18.48.82]) by smtp.gmail.com with ESMTPSA id k101sm5941687pjb.5.2019.12.04.01.54.22 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Dec 2019 01:54:24 -0800 (PST) From: Baolin Wang To: ohad@wizery.com, bjorn.andersson@linaro.org, baohua@kernel.org Cc: linux-arm-kernel@lists.infradead.org, baolin.wang7@gmail.com, linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] hwspinlock: sirf: Use devm_hwspin_lock_register() to register hwlock controller Date: Wed, 4 Dec 2019 17:53:33 +0800 Message-Id: X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: In-Reply-To: References: Sender: linux-remoteproc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org Use devm_hwspin_lock_register() to register the hwlock controller instead of unregistering the hwlock controller explicitly when removing the device. Signed-off-by: Baolin Wang --- drivers/hwspinlock/sirf_hwspinlock.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/drivers/hwspinlock/sirf_hwspinlock.c b/drivers/hwspinlock/sirf_hwspinlock.c index d62462e..823d3c4 100644 --- a/drivers/hwspinlock/sirf_hwspinlock.c +++ b/drivers/hwspinlock/sirf_hwspinlock.c @@ -79,23 +79,9 @@ static int sirf_hwspinlock_probe(struct platform_device *pdev) platform_set_drvdata(pdev, hwspin); - return hwspin_lock_register(&hwspin->bank, &pdev->dev, - &sirf_hwspinlock_ops, 0, - HW_SPINLOCK_NUMBER); -} - -static int sirf_hwspinlock_remove(struct platform_device *pdev) -{ - struct sirf_hwspinlock *hwspin = platform_get_drvdata(pdev); - int ret; - - ret = hwspin_lock_unregister(&hwspin->bank); - if (ret) { - dev_err(&pdev->dev, "%s failed: %d\n", __func__, ret); - return ret; - } - - return 0; + return devm_hwspin_lock_register(&pdev->dev, &hwspin->bank, + &sirf_hwspinlock_ops, 0, + HW_SPINLOCK_NUMBER); } static const struct of_device_id sirf_hwpinlock_ids[] = { @@ -106,7 +92,6 @@ static int sirf_hwspinlock_remove(struct platform_device *pdev) static struct platform_driver sirf_hwspinlock_driver = { .probe = sirf_hwspinlock_probe, - .remove = sirf_hwspinlock_remove, .driver = { .name = "atlas7_hwspinlock", .of_match_table = of_match_ptr(sirf_hwpinlock_ids),