| Message ID | 1386718996-3733-2-git-send-email-sboyd@codeaurora.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Stephen, On Tue, Dec 10, 2013 at 03:43:10PM -0800, Stephen Boyd wrote: > Instead of passing the pointer to the container structure just > pass the input device here. This saves a dereference in the fast > path. > > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> > --- > drivers/input/misc/pmic8xxx-pwrkey.c | 22 ++++++++-------------- > 1 file changed, 8 insertions(+), 14 deletions(-) > > diff --git a/drivers/input/misc/pmic8xxx-pwrkey.c b/drivers/input/misc/pmic8xxx-pwrkey.c > index ce3c426..233b216 100644 > --- a/drivers/input/misc/pmic8xxx-pwrkey.c > +++ b/drivers/input/misc/pmic8xxx-pwrkey.c > @@ -32,26 +32,21 @@ > * @key_press_irq: key press irq number > */ > struct pmic8xxx_pwrkey { > - struct input_dev *pwr; This causes compile errors as you need pwrkey->pwr in remove() to unregister input device. I'll fix it up. > int key_press_irq; > }; > > -static irqreturn_t pwrkey_press_irq(int irq, void *_pwrkey) > +static irqreturn_t pwrkey_press_irq(int irq, void *pwr) > { > - struct pmic8xxx_pwrkey *pwrkey = _pwrkey; > - > - input_report_key(pwrkey->pwr, KEY_POWER, 1); > - input_sync(pwrkey->pwr); > + input_report_key(pwr, KEY_POWER, 1); > + input_sync(pwr); > > return IRQ_HANDLED; > } > > -static irqreturn_t pwrkey_release_irq(int irq, void *_pwrkey) > +static irqreturn_t pwrkey_release_irq(int irq, void *pwr) > { > - struct pmic8xxx_pwrkey *pwrkey = _pwrkey; > - > - input_report_key(pwrkey->pwr, KEY_POWER, 0); > - input_sync(pwrkey->pwr); > + input_report_key(pwr, KEY_POWER, 0); > + input_sync(pwr); > > return IRQ_HANDLED; > } > @@ -147,12 +142,11 @@ static int pmic8xxx_pwrkey_probe(struct platform_device *pdev) > } > > pwrkey->key_press_irq = key_press_irq; > - pwrkey->pwr = pwr; > > platform_set_drvdata(pdev, pwrkey); > > err = devm_request_irq(&pdev->dev, key_press_irq, pwrkey_press_irq, > - IRQF_TRIGGER_RISING, "pmic8xxx_pwrkey_press", pwrkey); > + IRQF_TRIGGER_RISING, "pmic8xxx_pwrkey_press", pwr); > if (err < 0) { > dev_dbg(&pdev->dev, "Can't get %d IRQ for pwrkey: %d\n", > key_press_irq, err); > @@ -160,7 +154,7 @@ static int pmic8xxx_pwrkey_probe(struct platform_device *pdev) > } > > err = devm_request_irq(&pdev->dev, key_release_irq, pwrkey_release_irq, > - IRQF_TRIGGER_RISING, "pmic8xxx_pwrkey_release", pwrkey); > + IRQF_TRIGGER_RISING, "pmic8xxx_pwrkey_release", pwr); > if (err < 0) { > dev_dbg(&pdev->dev, "Can't get %d IRQ for pwrkey: %d\n", > key_release_irq, err); > -- > The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, > hosted by The Linux Foundation >
On 12/15, Dmitry Torokhov wrote: > Hi Stephen, > > On Tue, Dec 10, 2013 at 03:43:10PM -0800, Stephen Boyd wrote: > > Instead of passing the pointer to the container structure just > > pass the input device here. This saves a dereference in the fast > > path. > > > > Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> > > --- > > drivers/input/misc/pmic8xxx-pwrkey.c | 22 ++++++++-------------- > > 1 file changed, 8 insertions(+), 14 deletions(-) > > > > diff --git a/drivers/input/misc/pmic8xxx-pwrkey.c b/drivers/input/misc/pmic8xxx-pwrkey.c > > index ce3c426..233b216 100644 > > --- a/drivers/input/misc/pmic8xxx-pwrkey.c > > +++ b/drivers/input/misc/pmic8xxx-pwrkey.c > > @@ -32,26 +32,21 @@ > > * @key_press_irq: key press irq number > > */ > > struct pmic8xxx_pwrkey { > > - struct input_dev *pwr; > > This causes compile errors as you need pwrkey->pwr in remove() to > unregister input device. I'll fix it up. > Ah sorry. I forgot to send the patch before this that converts it to devm. > > err = devm_request_irq(&pdev->dev, key_press_irq, pwrkey_press_irq, > > - IRQF_TRIGGER_RISING, "pmic8xxx_pwrkey_press", pwrkey); > > + IRQF_TRIGGER_RISING, "pmic8xxx_pwrkey_press", pwr); As you can see here because this driver isn't currently using devm_request_irq().
diff --git a/drivers/input/misc/pmic8xxx-pwrkey.c b/drivers/input/misc/pmic8xxx-pwrkey.c index ce3c426..233b216 100644 --- a/drivers/input/misc/pmic8xxx-pwrkey.c +++ b/drivers/input/misc/pmic8xxx-pwrkey.c @@ -32,26 +32,21 @@ * @key_press_irq: key press irq number */ struct pmic8xxx_pwrkey { - struct input_dev *pwr; int key_press_irq; }; -static irqreturn_t pwrkey_press_irq(int irq, void *_pwrkey) +static irqreturn_t pwrkey_press_irq(int irq, void *pwr) { - struct pmic8xxx_pwrkey *pwrkey = _pwrkey; - - input_report_key(pwrkey->pwr, KEY_POWER, 1); - input_sync(pwrkey->pwr); + input_report_key(pwr, KEY_POWER, 1); + input_sync(pwr); return IRQ_HANDLED; } -static irqreturn_t pwrkey_release_irq(int irq, void *_pwrkey) +static irqreturn_t pwrkey_release_irq(int irq, void *pwr) { - struct pmic8xxx_pwrkey *pwrkey = _pwrkey; - - input_report_key(pwrkey->pwr, KEY_POWER, 0); - input_sync(pwrkey->pwr); + input_report_key(pwr, KEY_POWER, 0); + input_sync(pwr); return IRQ_HANDLED; } @@ -147,12 +142,11 @@ static int pmic8xxx_pwrkey_probe(struct platform_device *pdev) } pwrkey->key_press_irq = key_press_irq; - pwrkey->pwr = pwr; platform_set_drvdata(pdev, pwrkey); err = devm_request_irq(&pdev->dev, key_press_irq, pwrkey_press_irq, - IRQF_TRIGGER_RISING, "pmic8xxx_pwrkey_press", pwrkey); + IRQF_TRIGGER_RISING, "pmic8xxx_pwrkey_press", pwr); if (err < 0) { dev_dbg(&pdev->dev, "Can't get %d IRQ for pwrkey: %d\n", key_press_irq, err); @@ -160,7 +154,7 @@ static int pmic8xxx_pwrkey_probe(struct platform_device *pdev) } err = devm_request_irq(&pdev->dev, key_release_irq, pwrkey_release_irq, - IRQF_TRIGGER_RISING, "pmic8xxx_pwrkey_release", pwrkey); + IRQF_TRIGGER_RISING, "pmic8xxx_pwrkey_release", pwr); if (err < 0) { dev_dbg(&pdev->dev, "Can't get %d IRQ for pwrkey: %d\n", key_release_irq, err);
Instead of passing the pointer to the container structure just pass the input device here. This saves a dereference in the fast path. Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> --- drivers/input/misc/pmic8xxx-pwrkey.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-)