| Message ID | 20180212224759.15999-21-alexandre.belloni@bootlin.com |
|---|---|
| State | Accepted |
| Headers | show
Return-Path: <linux-rtc-owner@vger.kernel.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-rtc-owner@vger.kernel.org; receiver=<UNKNOWN>) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zgLZt2S8nz9sRW for <incoming@patchwork.ozlabs.org>; Tue, 13 Feb 2018 09:54:30 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933066AbeBLWy3 (ORCPT <rfc822;incoming@patchwork.ozlabs.org>); Mon, 12 Feb 2018 17:54:29 -0500 Received: from mail.free-electrons.com ([62.4.15.54]:37575 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932937AbeBLWsh (ORCPT <rfc822; linux-rtc@vger.kernel.org>); Mon, 12 Feb 2018 17:48:37 -0500 Received: by mail.free-electrons.com (Postfix, from userid 110) id DF6D7207F6; Mon, 12 Feb 2018 23:48:34 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT, URIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.4.0 Received: from localhost (unknown [88.191.26.124]) by mail.free-electrons.com (Postfix) with ESMTPSA id DB6F120813; Mon, 12 Feb 2018 23:48:09 +0100 (CET) From: Alexandre Belloni <alexandre.belloni@bootlin.com> To: linux-rtc@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Alexandre Belloni <alexandre.belloni@bootlin.com> Subject: [PATCH 20/45] rtc: remove nvmem_config Date: Mon, 12 Feb 2018 23:47:34 +0100 Message-Id: <20180212224759.15999-21-alexandre.belloni@bootlin.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180212224759.15999-1-alexandre.belloni@bootlin.com> References: <20180212224759.15999-1-alexandre.belloni@bootlin.com> Sender: linux-rtc-owner@vger.kernel.org Precedence: bulk List-ID: <linux-rtc.vger.kernel.org> X-Mailing-List: linux-rtc@vger.kernel.org |
| Series |
RTC: nvmem improvements
|
expand
|
diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c index 47c4aeed5106..999ed039da0d 100644 --- a/drivers/rtc/class.c +++ b/drivers/rtc/class.c @@ -453,8 +453,6 @@ int __rtc_register_device(struct module *owner, struct rtc_device *rtc) rtc_proc_add_device(rtc); - rtc_nvmem_register(rtc, rtc->nvmem_config); - rtc->registered = true; dev_info(rtc->dev.parent, "registered as %s\n", dev_name(&rtc->dev)); diff --git a/include/linux/rtc.h b/include/linux/rtc.h index fbc92fff7c2e..37b041f72f8d 100644 --- a/include/linux/rtc.h +++ b/include/linux/rtc.h @@ -145,7 +145,6 @@ struct rtc_device { bool registered; - struct nvmem_config *nvmem_config; struct nvmem_device *nvmem; /* Old ABI support */ bool nvram_old_abi;
Because nvmem_config is only used and copied at nvmem registration, remove it from struct rtc_device. All the rtc drivers using nvmem are now calling rtc_nvmem_register directly. Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> --- drivers/rtc/class.c | 2 -- include/linux/rtc.h | 1 - 2 files changed, 3 deletions(-)