Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757197AbbGGLSw (ORCPT ); Tue, 7 Jul 2015 07:18:52 -0400 Received: from mail-pa0-f50.google.com ([209.85.220.50]:35385 "EHLO mail-pa0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756389AbbGGLSp (ORCPT ); Tue, 7 Jul 2015 07:18:45 -0400 Message-ID: <559BB58E.9010406@linaro.org> Date: Tue, 07 Jul 2015 16:48:38 +0530 From: Vaibhav Hiremath User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Lee Jones CC: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, robh+dt@kernel.org, sameo@linux.intel.com, linux-kernel@vger.kernel.org, yizhang@marvell.com, Zhao Ye Subject: Re: [PATCH-V5 3/4] mfd: 88pm800: Set default interrupt clear method References: <1435591877-18214-1-git-send-email-vaibhav.hiremath@linaro.org> <1435591877-18214-4-git-send-email-vaibhav.hiremath@linaro.org> <20150707072958.GN3182@x1> <559BA1AE.9050006@linaro.org> <20150707104028.GR3182@x1> <559BAF23.90002@linaro.org> <20150707111248.GU3182@x1> In-Reply-To: <20150707111248.GU3182@x1> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4659 Lines: 130 On Tuesday 07 July 2015 04:42 PM, Lee Jones wrote: > On Tue, 07 Jul 2015, Vaibhav Hiremath wrote: >> On Tuesday 07 July 2015 04:10 PM, Lee Jones wrote: >>> On Tue, 07 Jul 2015, Vaibhav Hiremath wrote: >>>> On Tuesday 07 July 2015 12:59 PM, Lee Jones wrote: >>>>> On Mon, 29 Jun 2015, Vaibhav Hiremath wrote: >>>>> >>>>>> As per the spec, bit 1 (INT_CLEAR_MODE) of reg addr 0xe >>>>>> (page 0) controls the method of clearing interrupt >>>>>> status of 88pm800 family of devices; >>>>>> >>>>>> 0: clear on read >>>>>> 1: clear on write >>>>>> >>>>>> If pdata is not coming from board file, then set the >>>>>> default irq clear method to "irq clear on write" >>>>>> >>>>>> Also, as suggested by "Lee Jones" renaming variable field >>>>>> to appropriate name. >>>>>> >>>>>> Signed-off-by: Zhao Ye >>>>>> Signed-off-by: Vaibhav Hiremath >>>>>> --- >>>>>> drivers/mfd/88pm800.c | 15 ++++++++++----- >>>>>> include/linux/mfd/88pm80x.h | 10 ++++++++-- >>>>>> 2 files changed, 18 insertions(+), 7 deletions(-) >>>>>> >>>>>> diff --git a/drivers/mfd/88pm800.c b/drivers/mfd/88pm800.c >>>>>> index d495737..66347be 100644 >>>>>> --- a/drivers/mfd/88pm800.c >>>>>> +++ b/drivers/mfd/88pm800.c >>>>>> @@ -374,7 +374,7 @@ static int device_irq_init_800(struct pm80x_chip *chip) >>>>>> { >>>>>> struct regmap *map = chip->regmap; >>>>>> unsigned long flags = IRQF_ONESHOT; >>>>>> - int data, mask, ret = -EINVAL; >>>>>> + int irq_clr_mode, mask, ret = -EINVAL; >>>>>> >>>>>> if (!map || !chip->irq) { >>>>>> dev_err(chip->dev, "incorrect parameters\n"); >>>>>> @@ -382,15 +382,16 @@ static int device_irq_init_800(struct pm80x_chip *chip) >>>>>> } >>>>>> >>>>>> /* >>>>>> - * irq_mode defines the way of clearing interrupt. it's read-clear by >>>>>> - * default. >>>>>> + * irq_clr_on_wr defines the way of clearing interrupt by >>>>>> + * read/write(0/1). It's read-clear by default. >>>>>> */ >>>>>> mask = >>>>>> PM800_WAKEUP2_INV_INT | PM800_WAKEUP2_INT_CLEAR | >>>>>> PM800_WAKEUP2_INT_MASK; >>>>>> >>>>>> - data = PM800_WAKEUP2_INT_CLEAR; >>>>>> - ret = regmap_update_bits(map, PM800_WAKEUP2, mask, data); >>>>>> + irq_clr_mode = chip->irq_clr_method == PM800_IRQ_CLR_ON_WRITE ? >>>>>> + PM800_WAKEUP2_INT_WRITE_CLEAR : PM800_WAKEUP2_INT_READ_CLEAR; >>>>>> + ret = regmap_update_bits(map, PM800_WAKEUP2, mask, irq_clr_mode); >>>>> >>>>> What's stopping you just passing PM800_WAKEUP2_INT_WRITE_CLEAR or >>>>> PM800_WAKEUP2_INT_READ_CLEAR from pdata? Then you can use the value >>>>> directly without all of this faffing about. >>>>> >>>>> regmap_update_bits(map, PM800_WAKEUP2, mask, pdata->irq_clr_mode); >>>>> >>>> >>>> Because "irq_clr_method" is of boolean type. >>>> And macros which you are referring to is, >>>> >>>> #define PM800_WAKEUP2_INT_READ_CLEAR (0 << 1) >>>> #define PM800_WAKEUP2_INT_WRITE_CLEAR (1 << 1) >>>> >>>> >>>> And also, I feel it is more cleaner approach with the current code as >>>> register definition and userflag are maintained separately. >>> >>> I see your point, although it's a shame we have to have this code in >>> its place. >>> >>> One thing I think you can do though is rid chip->irq_clr_method, just >>> use the one you already have in pdata. >>> >> >> Looking at the current code, >> Yes, this can be done, but I have to do some more changes around it, >> to make code cleaner, >> >> change the signature of >> >> static int device_irq_init_800(struct pm80x_chip *chip) >> >> TO >> >> static int device_irq_init_800(struct pm80x_chip *chip, struct >> pm80x_platform_data *pdata) >> >> >> and then only use pdata->irq_clr_method. >> >> >> How do you want to get this inside? V6 version? or separate patch? >> >> I have one more cleanup patch in the queue, which I am planning to >> submit today, if you are ok then I can submit along with that. > > Ideally not. Don't you save the 'struct device' into *chip? You > should use that to fetch the pdata, like: > > pdata = dev_get_platdata(chip->dev); > Yes certainly, this is another option (rather preferred one). But to be consistent with other's I proposed this, please refer to the fn device_800_init(), where all xxx_init() are taking 2 arguments, and second argument is pdata. There is room for cleanup, I agree. I can put this too in the next cleanup series. Thanks, Vaibhav -- 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/