From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jarkko Nikula Subject: [PATCH 2/3] net: ethernet: Remove dummy runtime PM callbacks from Renesas drivers Date: Wed, 24 Oct 2018 16:51:33 +0300 Message-ID: <20181024135134.28456-3-jarkko.nikula@linux.intel.com> References: <20181024135134.28456-1-jarkko.nikula@linux.intel.com> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Return-path: In-Reply-To: <20181024135134.28456-1-jarkko.nikula@linux.intel.com> Sender: netdev-owner@vger.kernel.org To: linux-pm@vger.kernel.org Cc: linux-i2c@vger.kernel.org, Wolfram Sang , netdev@vger.kernel.org, "David S . Miller" , Sergei Shtylyov , linux-renesas-soc@vger.kernel.org, linux-usb@vger.kernel.org, Yoshihiro Shimoda , Jarkko Nikula List-Id: linux-i2c@vger.kernel.org Platform drivers don't need dummy runtime PM callbacks that just return success in order to have runtime PM happening. This has changed since following commits: 05aa55dddb9e ("PM / Runtime: Lenient generic runtime pm callbacks") 543f2503a956 ("PM / platform_bus: Allow runtime PM by default") 8b313a38ecff ("PM / Platform: Use generic runtime PM callbacks directly") Signed-off-by: Jarkko Nikula --- Only build tested. --- drivers/net/ethernet/renesas/ravb_main.c | 13 ------------- drivers/net/ethernet/renesas/sh_eth.c | 13 ------------- 2 files changed, 26 deletions(-) diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c index defed0d0c51d..9498f9d67501 100644 --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c @@ -2335,21 +2335,8 @@ static int __maybe_unused ravb_resume(struct device *dev) return ret; } -static int __maybe_unused ravb_runtime_nop(struct device *dev) -{ - /* Runtime PM callback shared between ->runtime_suspend() - * and ->runtime_resume(). Simply returns success. - * - * This driver re-initializes all registers after - * pm_runtime_get_sync() anyway so there is no need - * to save and restore registers here. - */ - return 0; -} - static const struct dev_pm_ops ravb_dev_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(ravb_suspend, ravb_resume) - SET_RUNTIME_PM_OPS(ravb_runtime_nop, ravb_runtime_nop, NULL) }; static struct platform_driver ravb_driver = { diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index f27a0dc8c563..980310686d45 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -3447,21 +3447,8 @@ static int sh_eth_resume(struct device *dev) } #endif -static int sh_eth_runtime_nop(struct device *dev) -{ - /* Runtime PM callback shared between ->runtime_suspend() - * and ->runtime_resume(). Simply returns success. - * - * This driver re-initializes all registers after - * pm_runtime_get_sync() anyway so there is no need - * to save and restore registers here. - */ - return 0; -} - static const struct dev_pm_ops sh_eth_dev_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(sh_eth_suspend, sh_eth_resume) - SET_RUNTIME_PM_OPS(sh_eth_runtime_nop, sh_eth_runtime_nop, NULL) }; #define SH_ETH_PM_OPS (&sh_eth_dev_pm_ops) #else -- 2.19.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [2/3] net: ethernet: Remove dummy runtime PM callbacks from Renesas drivers From: Jarkko Nikula Message-Id: <20181024135134.28456-3-jarkko.nikula@linux.intel.com> Date: Wed, 24 Oct 2018 16:51:33 +0300 To: linux-pm@vger.kernel.org Cc: linux-i2c@vger.kernel.org, Wolfram Sang , netdev@vger.kernel.org, "David S . Miller" , Sergei Shtylyov , linux-renesas-soc@vger.kernel.org, linux-usb@vger.kernel.org, Yoshihiro Shimoda , Jarkko Nikula List-ID: UGxhdGZvcm0gZHJpdmVycyBkb24ndCBuZWVkIGR1bW15IHJ1bnRpbWUgUE0gY2FsbGJhY2tzIHRo YXQganVzdCByZXR1cm4Kc3VjY2VzcyBpbiBvcmRlciB0byBoYXZlIHJ1bnRpbWUgUE0gaGFwcGVu aW5nLiBUaGlzIGhhcyBjaGFuZ2VkIHNpbmNlCmZvbGxvd2luZyBjb21taXRzOgoKMDVhYTU1ZGRk YjllICgiUE0gLyBSdW50aW1lOiBMZW5pZW50IGdlbmVyaWMgcnVudGltZSBwbSBjYWxsYmFja3Mi KQo1NDNmMjUwM2E5NTYgKCJQTSAvIHBsYXRmb3JtX2J1czogQWxsb3cgcnVudGltZSBQTSBieSBk ZWZhdWx0IikKOGIzMTNhMzhlY2ZmICgiUE0gLyBQbGF0Zm9ybTogVXNlIGdlbmVyaWMgcnVudGlt ZSBQTSBjYWxsYmFja3MgZGlyZWN0bHkiKQoKU2lnbmVkLW9mZi1ieTogSmFya2tvIE5pa3VsYSA8 amFya2tvLm5pa3VsYUBsaW51eC5pbnRlbC5jb20+Ci0tLQpPbmx5IGJ1aWxkIHRlc3RlZC4KLS0t CiBkcml2ZXJzL25ldC9ldGhlcm5ldC9yZW5lc2FzL3JhdmJfbWFpbi5jIHwgMTMgLS0tLS0tLS0t LS0tLQogZHJpdmVycy9uZXQvZXRoZXJuZXQvcmVuZXNhcy9zaF9ldGguYyAgICB8IDEzIC0tLS0t LS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMjYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9uZXQvZXRoZXJuZXQvcmVuZXNhcy9yYXZiX21haW4uYyBiL2RyaXZlcnMvbmV0L2V0 aGVybmV0L3JlbmVzYXMvcmF2Yl9tYWluLmMKaW5kZXggZGVmZWQwZDBjNTFkLi45NDk4ZjlkNjc1 MDEgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvbmV0L2V0aGVybmV0L3JlbmVzYXMvcmF2Yl9tYWluLmMK KysrIGIvZHJpdmVycy9uZXQvZXRoZXJuZXQvcmVuZXNhcy9yYXZiX21haW4uYwpAQCAtMjMzNSwy MSArMjMzNSw4IEBAIHN0YXRpYyBpbnQgX19tYXliZV91bnVzZWQgcmF2Yl9yZXN1bWUoc3RydWN0 IGRldmljZSAqZGV2KQogCXJldHVybiByZXQ7CiB9CiAKLXN0YXRpYyBpbnQgX19tYXliZV91bnVz ZWQgcmF2Yl9ydW50aW1lX25vcChzdHJ1Y3QgZGV2aWNlICpkZXYpCi17Ci0JLyogUnVudGltZSBQ TSBjYWxsYmFjayBzaGFyZWQgYmV0d2VlbiAtPnJ1bnRpbWVfc3VzcGVuZCgpCi0JICogYW5kIC0+ cnVudGltZV9yZXN1bWUoKS4gU2ltcGx5IHJldHVybnMgc3VjY2Vzcy4KLQkgKgotCSAqIFRoaXMg ZHJpdmVyIHJlLWluaXRpYWxpemVzIGFsbCByZWdpc3RlcnMgYWZ0ZXIKLQkgKiBwbV9ydW50aW1l X2dldF9zeW5jKCkgYW55d2F5IHNvIHRoZXJlIGlzIG5vIG5lZWQKLQkgKiB0byBzYXZlIGFuZCBy ZXN0b3JlIHJlZ2lzdGVycyBoZXJlLgotCSAqLwotCXJldHVybiAwOwotfQotCiBzdGF0aWMgY29u c3Qgc3RydWN0IGRldl9wbV9vcHMgcmF2Yl9kZXZfcG1fb3BzID0gewogCVNFVF9TWVNURU1fU0xF RVBfUE1fT1BTKHJhdmJfc3VzcGVuZCwgcmF2Yl9yZXN1bWUpCi0JU0VUX1JVTlRJTUVfUE1fT1BT KHJhdmJfcnVudGltZV9ub3AsIHJhdmJfcnVudGltZV9ub3AsIE5VTEwpCiB9OwogCiBzdGF0aWMg c3RydWN0IHBsYXRmb3JtX2RyaXZlciByYXZiX2RyaXZlciA9IHsKZGlmZiAtLWdpdCBhL2RyaXZl cnMvbmV0L2V0aGVybmV0L3JlbmVzYXMvc2hfZXRoLmMgYi9kcml2ZXJzL25ldC9ldGhlcm5ldC9y ZW5lc2FzL3NoX2V0aC5jCmluZGV4IGYyN2EwZGM4YzU2My4uOTgwMzEwNjg2ZDQ1IDEwMDY0NAot LS0gYS9kcml2ZXJzL25ldC9ldGhlcm5ldC9yZW5lc2FzL3NoX2V0aC5jCisrKyBiL2RyaXZlcnMv bmV0L2V0aGVybmV0L3JlbmVzYXMvc2hfZXRoLmMKQEAgLTM0NDcsMjEgKzM0NDcsOCBAQCBzdGF0 aWMgaW50IHNoX2V0aF9yZXN1bWUoc3RydWN0IGRldmljZSAqZGV2KQogfQogI2VuZGlmCiAKLXN0 YXRpYyBpbnQgc2hfZXRoX3J1bnRpbWVfbm9wKHN0cnVjdCBkZXZpY2UgKmRldikKLXsKLQkvKiBS dW50aW1lIFBNIGNhbGxiYWNrIHNoYXJlZCBiZXR3ZWVuIC0+cnVudGltZV9zdXNwZW5kKCkKLQkg KiBhbmQgLT5ydW50aW1lX3Jlc3VtZSgpLiBTaW1wbHkgcmV0dXJucyBzdWNjZXNzLgotCSAqCi0J ICogVGhpcyBkcml2ZXIgcmUtaW5pdGlhbGl6ZXMgYWxsIHJlZ2lzdGVycyBhZnRlcgotCSAqIHBt X3J1bnRpbWVfZ2V0X3N5bmMoKSBhbnl3YXkgc28gdGhlcmUgaXMgbm8gbmVlZAotCSAqIHRvIHNh dmUgYW5kIHJlc3RvcmUgcmVnaXN0ZXJzIGhlcmUuCi0JICovCi0JcmV0dXJuIDA7Ci19Ci0KIHN0 YXRpYyBjb25zdCBzdHJ1Y3QgZGV2X3BtX29wcyBzaF9ldGhfZGV2X3BtX29wcyA9IHsKIAlTRVRf U1lTVEVNX1NMRUVQX1BNX09QUyhzaF9ldGhfc3VzcGVuZCwgc2hfZXRoX3Jlc3VtZSkKLQlTRVRf UlVOVElNRV9QTV9PUFMoc2hfZXRoX3J1bnRpbWVfbm9wLCBzaF9ldGhfcnVudGltZV9ub3AsIE5V TEwpCiB9OwogI2RlZmluZSBTSF9FVEhfUE1fT1BTICgmc2hfZXRoX2Rldl9wbV9vcHMpCiAjZWxz ZQo=