Re: [PATCHv2 -next] INPUT/MISC/ONKEY: OnKey module of DA9052 PMICsdriver
From: Dmitry Torokhov
Date: Sun May 15 2011 - 04:12:50 EST
Hi Ashish,
On Fri, May 13, 2011 at 05:24:32PM +0530, Ashish Jangam wrote:
> Hi Dmitry,
>
> ONKEY Driver for Dialog Semiconductor DA9052 PMICs.
>
> Changes made since last submission:
> . used msecs_to_jiffies to take care of delay for different values of HZ
>
Thank you for making changes. A few more comments below, please hang on,
we are getting there.
> Signed-off-by: David Dajun Chen <dchen@xxxxxxxxxxx>
Since you are passing the patch to me your signoff is required as well.
> ---
> diff -Naur linux-next-20110421.orig/drivers/input/misc/da9052_onkey.c linux-next-20110421/drivers/input/misc/da9052_onkey.c
> --- linux-next-20110421.orig/drivers/input/misc/da9052_onkey.c 1970-01-01 05:00:00.000000000 +0500
> +++ linux-next-20110421/drivers/input/misc/da9052_onkey.c 2011-05-13 14:52:17.000000000 +0500
> @@ -0,0 +1,166 @@
> +/*
> + * ON pin driver for Dialog DA9052 PMICs
> + *
> + * Copyright(c) 2011 Dialog Semiconductor Ltd.
> + *
> + * Author: David Dajun Chen <dchen@xxxxxxxxxxx>
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms of the GNU General Public License as published by the
> + * Free Software Foundation; either version 2 of the License, or (at your
> + * option) any later version.
> + *
> + */
> +
> +#include <linux/module.h>
> +#include <linux/init.h>
> +#include <linux/input.h>
> +#include <linux/workqueue.h>
> +#include <linux/platform_device.h>
> +
> +#include <linux/mfd/da9052/da9052.h>
> +#include <linux/mfd/da9052/reg.h>
> +
> +struct da9052_onkey {
> + struct da9052 *da9052;
> + struct input_dev *input;
> + struct delayed_work work;
> + int irq;
> +};
> +
> +static void da9052_onkey_work(struct work_struct *work)
> +{
> + int ret;
> + struct da9052_onkey *onkey;
> + onkey = container_of(work, struct da9052_onkey, work.work);
> +
> + ret = da9052_reg_read(onkey->da9052, DA9052_EVENT_B_REG);
> + if (ret < 0) {
> + dev_err(onkey->da9052->dev,
> + "da9052_onkey_report_event da9052_reg_read error %d\n",
> + ret);
> + ret = 1;
> + } else {
> + ret = ret & DA9052_E_nONKEY;
> + input_report_key(onkey->input, KEY_POWER, ret);
> + input_sync(onkey->input);
> + }
> +
> + if (ret)
> + schedule_delayed_work(&onkey->work, msecs_to_jiffies(10));
Hmm, 10 msecs seems a bit low for power button... Maybe 50?
> +}
> +
> +static irqreturn_t da9052_onkey_irq(int irq, void *data)
> +{
> + struct da9052_onkey *onkey = data;
> +
> + schedule_delayed_work(&onkey->work, 0);
Instead of doing extra schedule I'd probably have
static void da9052_onkey_query(struct da9052_onkey *onkey)
{
...
if (ret)
schedule_delayed_work(&onkey->work, msecs_to_jiffies(50));
}
and
static void da9052_onkey_work(struct work_struct *work)
{
struct da9052_onkey *onkey =
container_of(work, struct da9052_onkey, work.work);
da9052_onkey_query(onkey);
}
and call da9052_onkey_work() directly from the ISR since it is threaded
and you are allowed to sleep.
> +
> + return IRQ_HANDLED;
> +}
> +
> +static int __devinit da9052_onkey_probe(struct platform_device *pdev)
> +{
> + struct da9052_onkey *onkey;
> + int error;
> +
> + onkey = kzalloc(sizeof(*onkey), GFP_KERNEL);
> + if (!onkey) {
> + dev_err(&pdev->dev, "Failed to allocate memory\n");
> + return -ENOMEM;
> + }
> +
> + onkey->input = input_allocate_device();
> + if (!onkey->input) {
> + error = -ENOMEM;
> + dev_err(&pdev->dev, "Failed to allocate input device, %d\n",
> + error);
> + goto err_mem;
> + }
> +
> + onkey->da9052 = dev_get_drvdata(pdev->dev.parent);
Probably check if parent's drvdata is not NULL?
> + onkey->irq = platform_get_irq_byname(pdev, "ONKEY");
> + if (onkey->irq < 0) {
> + error = -ENOMEM;
> + dev_err(&pdev->dev, "Failed to get an IRQ for input device, %d\n",
> + onkey->irq);
> + goto err_input;
> + }
> +
> + onkey->input->evbit[0] = BIT_MASK(EV_KEY);
> + onkey->input->keybit[BIT_WORD(KEY_POWER)] = BIT_MASK(KEY_POWER);
> + onkey->input->name = "da9052-onkey";
> + onkey->input->phys = "da9052-onkey/input0";
> + onkey->input->dev.parent = &pdev->dev;
> +
> + INIT_DELAYED_WORK(&onkey->work, da9052_onkey_work);
> +
> + error = request_threaded_irq(onkey->da9052->irq_base + onkey->irq,
> + NULL, da9052_onkey_irq, IRQF_TRIGGER_LOW | IRQF_ONESHOT,
> + "ONKEY", onkey);
> + if (error < 0) {
> + dev_err(onkey->da9052->dev,
> + "Failed to register ONKEY IRQ %d, error = %d\n",
> + onkey->da9052->irq_base + onkey->irq, error);
> + goto err_irq_reg;
> + }
> +
> + error = input_register_device(onkey->input);
> + if (error) {
> + dev_err(&pdev->dev, "Unable to register input device, %d\n",
> + error);
> + goto err_reg;
> + }
> +
> + platform_set_drvdata(pdev, onkey);
> +
> + return 0;
> +
> +err_reg:
> + free_irq(onkey->da9052->irq_base + onkey->irq, NULL);
> +err_irq_reg:
> + cancel_delayed_work_sync(&onkey->work);
> +err_input:
> + input_free_device(onkey->input);
> +err_mem:
> + kfree(onkey);
> + return error;
> +}
> +
> +static int __devexit da9052_onkey_remove(struct platform_device *pdev)
> +{
> + struct da9052_onkey *onkey = platform_get_drvdata(pdev);
> +
> + free_irq(onkey->da9052->irq_base + onkey->irq, NULL);
You need to pass 'onkey' instead of NULL to free_irq(), otherwise it
will not free your interrupt.
> + cancel_delayed_work_sync(&onkey->work);
> + input_unregister_device(onkey->input);
> + kfree(onkey);
> +
> + return 0;
> +}
> +
> +static struct platform_driver da9052_onkey_driver = {
> + .driver = {
> + .name = "da9052-onkey",
> + .owner = THIS_MODULE,
> + },
> + .probe = da9052_onkey_probe,
> + .remove = __devexit_p(da9052_onkey_remove),
> +};
> +
> +static int __init da9052_onkey_init(void)
> +{
> + return platform_driver_register(&da9052_onkey_driver);
> +}
> +module_init(da9052_onkey_init);
> +
> +static void __exit da9052_onkey_exit(void)
> +{
> + platform_driver_unregister(&da9052_onkey_driver);
> +}
> +module_exit(da9052_onkey_exit);
> +
> +MODULE_AUTHOR("David Dajun Chen <dchen@xxxxxxxxxxx>");
> +MODULE_DESCRIPTION("Onkey driver for DA9052");
> +MODULE_LICENSE("GPL");
> +MODULE_ALIAS("platform:da9052-onkey");
> diff -Naur linux-next-20110421.orig/drivers/input/misc/Kconfig linux-next-20110421/drivers/input/misc/Kconfig
> --- linux-next-20110421.orig/drivers/input/misc/Kconfig 2011-04-26 09:32:56.000000000 +0500
> +++ linux-next-20110421/drivers/input/misc/Kconfig 2011-05-13 15:02:15.000000000 +0500
> @@ -353,6 +353,13 @@
> To compile this driver as a module, choose M here: the
> module will be called rb532_button.
>
> +config INPUT_DA9052_ONKEY
> + tristate "Dialog DA9052 Onkey"
> + depends on PMIC_DA9052
> + help
> + Support the ONKEY of Dialog DA9052 PMICs as an input device
> + reporting power button status.
> +
To compile this driver as a module ...
> config INPUT_DM355EVM
> tristate "TI DaVinci DM355 EVM Keypad and IR Remote"
> depends on MFD_DM355EVM_MSP
> diff -Naur linux-next-20110421.orig/drivers/input/misc/Makefile linux-next-20110421/drivers/input/misc/Makefile
> --- linux-next-20110421.orig/drivers/input/misc/Makefile 2011-04-26 09:32:56.000000000 +0500
> +++ linux-next-20110421/drivers/input/misc/Makefile 2011-05-13 15:00:51.000000000 +0500
> @@ -21,6 +21,7 @@
> obj-$(CONFIG_INPUT_CMA3000) += cma3000_d0x.o
> obj-$(CONFIG_INPUT_CMA3000_I2C) += cma3000_d0x_i2c.o
> obj-$(CONFIG_INPUT_COBALT_BTNS) += cobalt_btns.o
> +obj-$(CONFIG_INPUT_DA9052_ONKEY) += da9052_onkey.o
> obj-$(CONFIG_INPUT_DM355EVM) += dm355evm_keys.o
> obj-$(CONFIG_HP_SDC_RTC) += hp_sdc_rtc.o
> obj-$(CONFIG_INPUT_IXP4XX_BEEPER) += ixp4xx-beeper.o
> diff -Naur linux-next-20110421.orig/drivers/leds/Kconfig linux-next-20110421/drivers/leds/Kconfig
> --- linux-next-20110421.orig/drivers/leds/Kconfig 2011-04-26 09:32:34.000000000 +0500
> +++ linux-next-20110421/drivers/leds/Kconfig 2011-05-13 15:04:29.000000000 +0500
It looks like there some unrelated to input code in the patch.
Thanks.
--
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/