From patchwork Thu Nov 19 11:41:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 1402924 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=linux-rtc-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bgdev.pl Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=bgdev-pl.20150623.gappssmtp.com header.i=@bgdev-pl.20150623.gappssmtp.com header.a=rsa-sha256 header.s=20150623 header.b=hNUz8XkH; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4CcHr74HzTz9sVs for ; Thu, 19 Nov 2020 22:43:34 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727477AbgKSLnc (ORCPT ); Thu, 19 Nov 2020 06:43:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727429AbgKSLnK (ORCPT ); Thu, 19 Nov 2020 06:43:10 -0500 Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 501A1C061A4C for ; Thu, 19 Nov 2020 03:43:09 -0800 (PST) Received: by mail-wm1-x342.google.com with SMTP id c9so6872836wml.5 for ; Thu, 19 Nov 2020 03:43:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bgdev-pl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0GrbllWNlOi0aXzL8UKo7Ky/Zu/FqzuF2bHcZS29c2k=; b=hNUz8XkHmocpco9nnHC0gTQJ7r44zzeIxvkG6EQICbkwSL5gNVy1H3UBMt9ZMaNsjq 3VXxQfoV6UDvXw1x6tBLEdwf/tO7cV+AF1ndCdTROKDxcmZ5+c03EV2+LsIWINGfukPK Ku0+/Wja9SMFmEBbupNrylCq8C+/lZHy4wbBpB62zrqaBnPck+K9cVrPndKwGfDdo4HB jJwdMWziGYceXyYCaeYzLhyURxBtWsgzCrpUU5JuyPcflZE0Hpy2Z30HH+XX90PF15QS iaFGLmG0A5s4LA2Zjwi3Zm4GXQhVNTezbyiM1cSd5sSgQNlwgvV/CvIDTmOhI9licOtV NyEQ== 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=0GrbllWNlOi0aXzL8UKo7Ky/Zu/FqzuF2bHcZS29c2k=; b=tM+Q0axKNFIiIixnMRvJuHP7nd6WyUDvDFy1XgPvKBOx0WCCb/EXh+DTDWQlhgJD2A qUfWfymWnkLptVtgTYfyvq8MkrVtZ61WTckGwKMUe93ri3uTsWM1RW4i46Mk0XmgEpaB 4ZYkT3e1PhAQBnQKRy8BQlOo2+SsLHibEz8DegnFLUoKcToLJiFNuNSNNmIoAoETzyfs 7BEvFYZWpr9+9Q86NPIsEoEFDZcdMT6gRyc9mrAcMHNenIqCeGC+Bt8SZqnkEYpHaem1 QIa9uGMgnPS9i2Mk0j3W8FBmwThIR5/AistR3przD2PE+RdRX1NaBPpbKad8OtfJdpuL rgOQ== X-Gm-Message-State: AOAM530pdnSLFy5pbjSbrol2wgIpHkTbJYP1L+cf/UDkNh1O2EYDutu4 0El1PvpJsYmssSD3/kDPkDrewQ== X-Google-Smtp-Source: ABdhPJxL/+GwdPD3F/9QcF+Gnxj3vmEy215nZrB2sXIZo+yqMFxANH21tdrvG4DWwVvRlCuiqVRLBg== X-Received: by 2002:a7b:c77a:: with SMTP id x26mr4082286wmk.63.1605786188098; Thu, 19 Nov 2020 03:43:08 -0800 (PST) Received: from localhost.localdomain (lfbn-nic-1-190-206.w2-15.abo.wanadoo.fr. [2.15.39.206]) by smtp.gmail.com with ESMTPSA id u23sm9745178wmc.32.2020.11.19.03.43.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2020 03:43:07 -0800 (PST) From: Bartosz Golaszewski To: Alessandro Zummo , Alexandre Belloni Cc: linux-rtc@vger.kernel.org, linux-kernel@vger.kernel.org, Bartosz Golaszewski Subject: [PATCH 59/59] rtc: remove devm_rtc_device_register() Date: Thu, 19 Nov 2020 12:41:49 +0100 Message-Id: <20201119114149.4117-60-brgl@bgdev.pl> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201119114149.4117-1-brgl@bgdev.pl> References: <20201119114149.4117-1-brgl@bgdev.pl> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-rtc@vger.kernel.org From: Bartosz Golaszewski All users have been converted to using the devm_rtc_allocate_device() + devm_rtc_register_device() pair. We can remove the deprecated interface. Signed-off-by: Bartosz Golaszewski --- .../driver-api/driver-model/devres.rst | 1 - drivers/rtc/class.c | 36 ------------------- include/linux/rtc.h | 4 --- 3 files changed, 41 deletions(-) diff --git a/Documentation/driver-api/driver-model/devres.rst b/Documentation/driver-api/driver-model/devres.rst index cd8b6e657b94..f22823af7265 100644 --- a/Documentation/driver-api/driver-model/devres.rst +++ b/Documentation/driver-api/driver-model/devres.rst @@ -412,7 +412,6 @@ RESET devm_reset_controller_register() RTC - devm_rtc_device_register() devm_rtc_allocate_device() devm_rtc_register_device() devm_rtc_nvmem_register() diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c index e6b44b7c4ad3..e192ea39ff3f 100644 --- a/drivers/rtc/class.c +++ b/drivers/rtc/class.c @@ -415,42 +415,6 @@ int __devm_rtc_register_device(struct module *owner, struct rtc_device *rtc) } EXPORT_SYMBOL_GPL(__devm_rtc_register_device); -/** - * devm_rtc_device_register - resource managed rtc_device_register() - * @dev: the device to register - * @name: the name of the device (unused) - * @ops: the rtc operations structure - * @owner: the module owner - * - * @return a struct rtc on success, or an ERR_PTR on error - * - * Managed rtc_device_register(). The rtc_device returned from this function - * are automatically freed on driver detach. - * This function is deprecated, use devm_rtc_allocate_device and - * rtc_register_device instead - */ -struct rtc_device *devm_rtc_device_register(struct device *dev, - const char *name, - const struct rtc_class_ops *ops, - struct module *owner) -{ - struct rtc_device *rtc; - int err; - - rtc = devm_rtc_allocate_device(dev); - if (IS_ERR(rtc)) - return rtc; - - rtc->ops = ops; - - err = __devm_rtc_register_device(owner, rtc); - if (err) - return ERR_PTR(err); - - return rtc; -} -EXPORT_SYMBOL_GPL(devm_rtc_device_register); - static int __init rtc_init(void) { rtc_class = class_create(THIS_MODULE, "rtc"); diff --git a/include/linux/rtc.h b/include/linux/rtc.h index 55e7beed066c..e3623446a9d7 100644 --- a/include/linux/rtc.h +++ b/include/linux/rtc.h @@ -150,10 +150,6 @@ struct rtc_device { #define RTC_TIMESTAMP_END_2199 7258118399LL /* 2199-12-31 23:59:59 */ #define RTC_TIMESTAMP_END_9999 253402300799LL /* 9999-12-31 23:59:59 */ -extern struct rtc_device *devm_rtc_device_register(struct device *dev, - const char *name, - const struct rtc_class_ops *ops, - struct module *owner); struct rtc_device *devm_rtc_allocate_device(struct device *dev); int __devm_rtc_register_device(struct module *owner, struct rtc_device *rtc);