From: Denis OSTERLAND <denis.osterland@diehl.com>
To: "a.zummo@towertech.it" <a.zummo@towertech.it>,
"alexandre.belloni@bootlin.com" <alexandre.belloni@bootlin.com>
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"robh+dt@kernel.org" <robh+dt@kernel.org>,
"m.grzeschik@pengutronix.de" <m.grzeschik@pengutronix.de>,
"devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
"mark.rutland@arm.com" <mark.rutland@arm.com>,
"linux-rtc@vger.kernel.org" <linux-rtc@vger.kernel.org>,
"kernel@pengutronix.de" <kernel@pengutronix.de>,
Denis OSTERLAND <denis.osterland@diehl.com>
Subject: [PATCH v4 1/5] rtc: sysfs: facilitate attribute add to rtc device
Date: Tue, 10 Jul 2018 09:44:15 +0000 [thread overview]
Message-ID: <20180710090710.9066-2-Denis.Osterland@diehl.com> (raw)
In-Reply-To: <20180710090710.9066-1-Denis.Osterland@diehl.com>
From: Denis Osterland <Denis.Osterland@diehl.com>
This patches addresses following problem:
rtc_allocate_device
devm_device_add_group <-- kernel oops / null pointer, because
sysfs entry does not yet exist
rtc_register_device
rc = devm_device_add_group
if (rc)
return rc; <-- forbidden to return error code
after device register
In case groups were not yet registered (kobj.state_in_sysfs == 0)
rtc_add_group just addes given group to dev.groups,
otherwise it uses devm_device_add_group.
Signed-off-by: Denis Osterland <Denis.Osterland@diehl.com>
---
drivers/rtc/rtc-core.h | 6 ++++++
drivers/rtc/rtc-sysfs.c | 39 +++++++++++++++++++++++++++++++++++++++
2 files changed, 45 insertions(+)
diff --git a/drivers/rtc/rtc-core.h b/drivers/rtc/rtc-core.h
index 0abf98983e13..81d1c3ce7a96 100644
--- a/drivers/rtc/rtc-core.h
+++ b/drivers/rtc/rtc-core.h
@@ -40,9 +40,15 @@ static inline void rtc_proc_del_device(struct rtc_device *rtc)
#ifdef CONFIG_RTC_INTF_SYSFS
const struct attribute_group **rtc_get_dev_attribute_groups(void);
+int rtc_add_group(struct rtc_device *rtc, const struct attribute_group *grp);
#else
static inline const struct attribute_group **rtc_get_dev_attribute_groups(void)
{
return NULL;
}
+static inline
+int rtc_add_group(struct rtc_device *rtc, const struct attribute_group *grp)
+{
+ return 0;
+}
#endif
diff --git a/drivers/rtc/rtc-sysfs.c b/drivers/rtc/rtc-sysfs.c
index 454da38c6012..9a177b8f761b 100644
--- a/drivers/rtc/rtc-sysfs.c
+++ b/drivers/rtc/rtc-sysfs.c
@@ -317,3 +317,42 @@ const struct attribute_group **rtc_get_dev_attribute_groups(void)
{
return rtc_attr_groups;
}
+
+static size_t rtc_group_count(struct rtc_device *rtc)
+{
+ const struct attribute_group **groups = rtc->dev.groups;
+ size_t cnt = 0;
+
+ if (groups)
+ for (; *groups; groups++)
+ cnt++;
+
+ return cnt;
+}
+
+static inline int
+__rtc_add_group(struct rtc_device *rtc, const struct attribute_group *grp)
+{
+ size_t cnt = rtc_group_count(rtc);
+ const struct attribute_group **groups, **old;
+
+ groups = devm_kzalloc(&rtc->dev, (cnt+2)*sizeof(*groups), GFP_KERNEL);
+ if (IS_ERR_OR_NULL(groups))
+ return PTR_ERR(groups);
+ memcpy(groups, rtc->dev.groups, cnt*sizeof(*groups));
+ groups[cnt] = grp;
+
+ old = rtc->dev.groups;
+ rtc->dev.groups = groups;
+ if (old != rtc_attr_groups)
+ devm_kfree(&rtc->dev, old);
+
+ return 0;
+}
+
+int rtc_add_group(struct rtc_device *rtc, const struct attribute_group *grp)
+{
+ return rtc->dev.kobj.state_in_sysfs ?
+ devm_device_add_group(&rtc->dev, grp) :
+ __rtc_add_group(rtc, grp);
+}
--
2.18.0
Diehl Connectivity Solutions GmbH
Geschäftsführung: Horst Leonberger
Sitz der Gesellschaft: Nürnberg - Registergericht: Amtsgericht
Nürnberg: HRB 32315
___________________________________________________________________________________________________
Der Inhalt der vorstehenden E-Mail ist nicht rechtlich bindend. Diese E-Mail enthaelt vertrauliche und/oder rechtlich geschuetzte Informationen.
Informieren Sie uns bitte, wenn Sie diese E-Mail faelschlicherweise erhalten haben. Bitte loeschen Sie in diesem Fall die Nachricht.
Jede unerlaubte Form der Reproduktion, Bekanntgabe, Aenderung, Verteilung und/oder Publikation dieser E-Mail ist strengstens untersagt.
The contents of the above mentioned e-mail is not legally binding. This e-mail contains confidential and/or legally protected information. Please inform us if you have received this e-mail by
mistake and delete it in such a case. Each unauthorized reproduction, disclosure, alteration, distribution and/or publication of this e-mail is strictly prohibited.
next prev parent reply other threads:[~2018-07-10 9:55 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-10 9:44 [PATCH v4 0/5] rtc: isl1208: fixes, documentation and isl1219 support Denis OSTERLAND
2018-07-10 9:44 ` [PATCH v4 5/5] rtc: isl1219: add device tree docu Denis OSTERLAND
2018-07-11 15:16 ` Rob Herring
2018-07-12 6:42 ` Denis OSTERLAND
2018-07-18 7:38 ` Alexandre Belloni
2018-07-18 7:55 ` Denis OSTERLAND
2018-07-10 9:44 ` [PATCH v4 3/5] rtc: isl1208: Add "evdet" interrupt source for isl1219 Denis OSTERLAND
2018-07-10 9:44 ` [PATCH v4 2/5] rtc: isl1208: add support for isl1219 with tamper detection Denis OSTERLAND
2018-07-10 13:20 ` kbuild test robot
2018-07-10 14:06 ` Denis OSTERLAND
2018-07-11 6:01 ` Ye Xiaolong
2018-07-18 8:13 ` Alexandre Belloni
2018-07-18 10:44 ` Denis OSTERLAND
2018-07-10 9:44 ` [PATCH v4 4/5] rtc: isl1208: set ev-evienb bit from device tree Denis OSTERLAND
2018-07-10 9:44 ` Denis OSTERLAND [this message]
2018-07-18 7:25 ` [PATCH v4 1/5] rtc: sysfs: facilitate attribute add to rtc device Alexandre Belloni
2018-07-18 7:37 ` Denis OSTERLAND
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180710090710.9066-2-Denis.Osterland@diehl.com \
--to=denis.osterland@diehl.com \
--cc=a.zummo@towertech.it \
--cc=alexandre.belloni@bootlin.com \
--cc=devicetree@vger.kernel.org \
--cc=kernel@pengutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rtc@vger.kernel.org \
--cc=m.grzeschik@pengutronix.de \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).