Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751718AbaGGGJe (ORCPT ); Mon, 7 Jul 2014 02:09:34 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]:24768 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750859AbaGGGJb (ORCPT ); Mon, 7 Jul 2014 02:09:31 -0400 MIME-version: 1.0 Content-type: text/plain; charset=UTF-8 X-AuditID: cbfec7f5-b7f626d000004b39-74-53ba399973c2 Content-transfer-encoding: 8BIT Message-id: <1404713368.4367.1.camel@AMDC1943> Subject: Re: [PATCH v7 10/24] rtc: max77686: Remove dead code for SMPL and WTSR. From: Krzysztof Kozlowski To: Javier Martinez Canillas Cc: Lee Jones , Mark Brown , Mike Turquette , Liam Girdwood , Alessandro Zummo , Kukjin Kim , Doug Anderson , Olof Johansson , Tomeu Vizoso , Yadwinder Singh Brar , Tushar Behera , Andreas Farber , linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Date: Mon, 07 Jul 2014 08:09:28 +0200 In-reply-to: <1404505467-26526-11-git-send-email-javier.martinez@collabora.co.uk> References: <1404505467-26526-1-git-send-email-javier.martinez@collabora.co.uk> <1404505467-26526-11-git-send-email-javier.martinez@collabora.co.uk> X-Mailer: Evolution 3.10.4-0ubuntu1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuplkeLIzCtJLcpLzFFi42I5/e/4Nd2ZlruCDa6vV7FYcvEqu0XzpmKL qQ+fsFnMP3KO1eLssoNsFkd/F1j0LrjKZnH/61FGi29XOpgsNj2+xmpxedccNosZ5/cxWTyd cJHN4tT1z2wWfWsvsVlsmLyb3WLu70ZWB0GP2Q0XWTz+Pr/O4rHj7hJGj52z7rJ7bFrVyeZx 59oeNo/NS+o9rpxoYvXo27KK0WPz6WqP6fN+Mnl83iQXwBPFZZOSmpNZllqkb5fAlbH92ge2 glcaFZv/hzYwblXoYuTkkBAwkdhwdiEjhC0mceHeerYuRi4OIYGljBKLf51nB0nwCghK/Jh8 j6WLkYODWUBe4silbJAws4C6xKR5i5gh6j8zSky6eogJol5PovfOFrBeYYEAidmH+plBbDYB Y4nNy5ewgdgiAnYSN1Y/BGtmFrjFIvFr+SZWkASLgKrEgc1b2UCWcQoESzTfTYBYMI1R4sn8 FSwQlypLzNt/jGkCo8AsJPfNQrhvFpL7FjAyr2IUTS1NLihOSs810itOzC0uzUvXS87P3cQI icKvOxiXHrM6xCjAwajEw3tj/85gIdbEsuLK3EOMEhzMSiK8Z9yAQrwpiZVVqUX58UWlOanF hxiZODilGhiTfPMYIxT08vmMb60tenm36zWf06wzaydsT+XatSk/yNDpUvLLebrnOvv0Kx+t 7vt19d/sluY9zFe9I974cPxa/Wxpm6/c+WjzZcqM8T+j+HXd3FcubFwnJcFq+dMrxVYn5/PT vQfDZ4jzCd2aukl0yaptnTJbnRhm3wF6zuFCiWJUpIaljRJLcUaioRZzUXEiAAvgk6WgAgAA Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On pią, 2014-07-04 at 22:24 +0200, Javier Martinez Canillas wrote: > The MAX77686 RTC chip has two features called SMPL (Sudden Momentary > Power Loss) and WTSR (Watchdog Timeout and Software Resets). > Support for these features seems to be implemented in the driver but > compilation is disabled using a C pre-processor conditional. > > This code has been disabled since the driver was original merged in > commit fca1dd03 ("rtc: max77686: add Maxim 77686 driver"). > > So, since this code has never been built, let's just remove it. > > Signed-off-by: Javier Martinez Canillas > --- > drivers/rtc/rtc-max77686.c | 101 --------------------------------------------- > 1 file changed, 101 deletions(-) Reviewed-by: Krzysztof Kozlowski Best regards, Krzysztof > > diff --git a/drivers/rtc/rtc-max77686.c b/drivers/rtc/rtc-max77686.c > index c1c6055..7bb5433 100644 > --- a/drivers/rtc/rtc-max77686.c > +++ b/drivers/rtc/rtc-max77686.c > @@ -32,15 +32,6 @@ > #define RTC_UDR_MASK (1 << RTC_UDR_SHIFT) > #define RTC_RBUDR_SHIFT 4 > #define RTC_RBUDR_MASK (1 << RTC_RBUDR_SHIFT) > -/* WTSR and SMPL Register */ > -#define WTSRT_SHIFT 0 > -#define SMPLT_SHIFT 2 > -#define WTSR_EN_SHIFT 6 > -#define SMPL_EN_SHIFT 7 > -#define WTSRT_MASK (3 << WTSRT_SHIFT) > -#define SMPLT_MASK (3 << SMPLT_SHIFT) > -#define WTSR_EN_MASK (1 << WTSR_EN_SHIFT) > -#define SMPL_EN_MASK (1 << SMPL_EN_SHIFT) > /* RTC Hour register */ > #define HOUR_PM_SHIFT 6 > #define HOUR_PM_MASK (1 << HOUR_PM_SHIFT) > @@ -49,7 +40,6 @@ > #define ALARM_ENABLE_MASK (1 << ALARM_ENABLE_SHIFT) > > #define MAX77686_RTC_UPDATE_DELAY 16 > -#undef MAX77686_RTC_WTSR_SMPL > > enum { > RTC_SEC = 0, > @@ -412,64 +402,6 @@ static const struct rtc_class_ops max77686_rtc_ops = { > .alarm_irq_enable = max77686_rtc_alarm_irq_enable, > }; > > -#ifdef MAX77686_RTC_WTSR_SMPL > -static void max77686_rtc_enable_wtsr(struct max77686_rtc_info *info, bool enable) > -{ > - int ret; > - unsigned int val, mask; > - > - if (enable) > - val = (1 << WTSR_EN_SHIFT) | (3 << WTSRT_SHIFT); > - else > - val = 0; > - > - mask = WTSR_EN_MASK | WTSRT_MASK; > - > - dev_info(info->dev, "%s: %s WTSR\n", __func__, > - enable ? "enable" : "disable"); > - > - ret = regmap_update_bits(info->max77686->rtc_regmap, > - MAX77686_WTSR_SMPL_CNTL, mask, val); > - if (ret < 0) { > - dev_err(info->dev, "%s: fail to update WTSR reg(%d)\n", > - __func__, ret); > - return; > - } > - > - max77686_rtc_update(info, MAX77686_RTC_WRITE); > -} > - > -static void max77686_rtc_enable_smpl(struct max77686_rtc_info *info, bool enable) > -{ > - int ret; > - unsigned int val, mask; > - > - if (enable) > - val = (1 << SMPL_EN_SHIFT) | (0 << SMPLT_SHIFT); > - else > - val = 0; > - > - mask = SMPL_EN_MASK | SMPLT_MASK; > - > - dev_info(info->dev, "%s: %s SMPL\n", __func__, > - enable ? "enable" : "disable"); > - > - ret = regmap_update_bits(info->max77686->rtc_regmap, > - MAX77686_WTSR_SMPL_CNTL, mask, val); > - if (ret < 0) { > - dev_err(info->dev, "%s: fail to update SMPL reg(%d)\n", > - __func__, ret); > - return; > - } > - > - max77686_rtc_update(info, MAX77686_RTC_WRITE); > - > - val = 0; > - regmap_read(info->max77686->rtc_regmap, MAX77686_WTSR_SMPL_CNTL, &val); > - dev_info(info->dev, "%s: WTSR_SMPL(0x%02x)\n", __func__, val); > -} > -#endif /* MAX77686_RTC_WTSR_SMPL */ > - > static int max77686_rtc_init_reg(struct max77686_rtc_info *info) > { > u8 data[2]; > @@ -519,11 +451,6 @@ static int max77686_rtc_probe(struct platform_device *pdev) > goto err_rtc; > } > > -#ifdef MAX77686_RTC_WTSR_SMPL > - max77686_rtc_enable_wtsr(info, true); > - max77686_rtc_enable_smpl(info, true); > -#endif > - > device_init_wakeup(&pdev->dev, 1); > > info->rtc_dev = devm_rtc_device_register(&pdev->dev, "max77686-rtc", > @@ -556,33 +483,6 @@ err_rtc: > return ret; > } > > -static void max77686_rtc_shutdown(struct platform_device *pdev) > -{ > -#ifdef MAX77686_RTC_WTSR_SMPL > - struct max77686_rtc_info *info = platform_get_drvdata(pdev); > - int i; > - u8 val = 0; > - > - for (i = 0; i < 3; i++) { > - max77686_rtc_enable_wtsr(info, false); > - regmap_read(info->max77686->rtc_regmap, MAX77686_WTSR_SMPL_CNTL, &val); > - dev_info(info->dev, "%s: WTSR_SMPL reg(0x%02x)\n", __func__, > - val); > - if (val & WTSR_EN_MASK) { > - dev_emerg(info->dev, "%s: fail to disable WTSR\n", > - __func__); > - } else { > - dev_info(info->dev, "%s: success to disable WTSR\n", > - __func__); > - break; > - } > - } > - > - /* Disable SMPL when power off */ > - max77686_rtc_enable_smpl(info, false); > -#endif /* MAX77686_RTC_WTSR_SMPL */ > -} > - > #ifdef CONFIG_PM_SLEEP > static int max77686_rtc_suspend(struct device *dev) > { > @@ -622,7 +522,6 @@ static struct platform_driver max77686_rtc_driver = { > .pm = &max77686_rtc_pm_ops, > }, > .probe = max77686_rtc_probe, > - .shutdown = max77686_rtc_shutdown, > .id_table = rtc_id, > }; > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/