From patchwork Thu Sep 20 14:35:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Belloni X-Patchwork-Id: 972478 Return-Path: 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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bootlin.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42GK5r46CNz9sBv for ; Fri, 21 Sep 2018 00:35:44 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731416AbeITUTa (ORCPT ); Thu, 20 Sep 2018 16:19:30 -0400 Received: from mail.bootlin.com ([62.4.15.54]:58467 "EHLO mail.bootlin.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726990AbeITUT3 (ORCPT ); Thu, 20 Sep 2018 16:19:29 -0400 Received: by mail.bootlin.com (Postfix, from userid 110) id 0363F207D4; Thu, 20 Sep 2018 16:35:41 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail.bootlin.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 [15.65.243.10]) by mail.bootlin.com (Postfix) with ESMTPSA id 40B5420379; Thu, 20 Sep 2018 16:35:30 +0200 (CEST) From: Alexandre Belloni To: linux-rtc@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Alexandre Belloni Subject: [PATCH] rtc: ds1307: use rtc_add_group Date: Thu, 20 Sep 2018 16:35:26 +0200 Message-Id: <20180920143526.18704-1-alexandre.belloni@bootlin.com> X-Mailer: git-send-email 2.19.0 MIME-Version: 1.0 Sender: linux-rtc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rtc@vger.kernel.org Register frequency test using rtc_add_group to avoid a possible race condition and simplify the code. This also moves the attribute to its proper location under the rtc device instead of the i2c parent device. Signed-off-by: Alexandre Belloni --- drivers/rtc/rtc-ds1307.c | 53 +++++++++++----------------------------- 1 file changed, 14 insertions(+), 39 deletions(-) diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c index edccd0c0da25..982503a168d0 100644 --- a/drivers/rtc/rtc-ds1307.c +++ b/drivers/rtc/rtc-ds1307.c @@ -1050,11 +1050,11 @@ static int m41txx_rtc_set_offset(struct device *dev, long offset) ctrl_reg); } -static ssize_t frequency_test_enable_store(struct device *dev, - struct device_attribute *attr, - const char *buf, size_t count) +static ssize_t frequency_test_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) { - struct ds1307 *ds1307 = dev_get_drvdata(dev); + struct ds1307 *ds1307 = dev_get_drvdata(dev->parent); bool freq_test_en; int ret; @@ -1070,11 +1070,11 @@ static ssize_t frequency_test_enable_store(struct device *dev, return count; } -static ssize_t frequency_test_enable_show(struct device *dev, - struct device_attribute *attr, - char *buf) +static ssize_t frequency_test_show(struct device *dev, + struct device_attribute *attr, + char *buf) { - struct ds1307 *ds1307 = dev_get_drvdata(dev); + struct ds1307 *ds1307 = dev_get_drvdata(dev->parent); unsigned int ctrl_reg; regmap_read(ds1307->regmap, M41TXX_REG_CONTROL, &ctrl_reg); @@ -1083,10 +1083,10 @@ static ssize_t frequency_test_enable_show(struct device *dev, "off\n"); } -static DEVICE_ATTR_RW(frequency_test_enable); +static DEVICE_ATTR_RW(frequency_test); static struct attribute *rtc_freq_test_attrs[] = { - &dev_attr_frequency_test_enable.attr, + &dev_attr_frequency_test.attr, NULL, }; @@ -1094,13 +1094,6 @@ static const struct attribute_group rtc_freq_test_attr_group = { .attrs = rtc_freq_test_attrs, }; -static void rtc_calib_remove_sysfs_group(void *_dev) -{ - struct device *dev = _dev; - - sysfs_remove_group(&dev->kobj, &rtc_freq_test_attr_group); -} - static int ds1307_add_frequency_test(struct ds1307 *ds1307) { int err; @@ -1109,27 +1102,9 @@ static int ds1307_add_frequency_test(struct ds1307 *ds1307) case m41t0: case m41t00: case m41t11: - /* Export sysfs entries */ - err = sysfs_create_group(&(ds1307->dev)->kobj, - &rtc_freq_test_attr_group); - if (err) { - dev_err(ds1307->dev, - "Failed to create sysfs group: %d\n", - err); - return err; - } - - err = devm_add_action_or_reset(ds1307->dev, - rtc_calib_remove_sysfs_group, - ds1307->dev); - if (err) { - dev_err(ds1307->dev, - "Failed to add sysfs cleanup action: %d\n", - err); - sysfs_remove_group(&(ds1307->dev)->kobj, - &rtc_freq_test_attr_group); + err = rtc_add_group(ds1307->rtc, &rtc_freq_test_attr_group); + if (err) return err; - } break; default: break; @@ -1876,11 +1851,11 @@ static int ds1307_probe(struct i2c_client *client, } ds1307->rtc->ops = chip->rtc_ops ?: &ds13xx_rtc_ops; - err = rtc_register_device(ds1307->rtc); + err = ds1307_add_frequency_test(ds1307); if (err) return err; - err = ds1307_add_frequency_test(ds1307); + err = rtc_register_device(ds1307->rtc); if (err) return err;