From: Dmitry Torokhov <dmitry.torokhov@gmail.com> To: Janusz Krzysztofik <jmkrzyszt@gmail.com> Cc: Tony Lindgren <tony@atomide.com>, Aaro Koskinen <aaro.koskinen@iki.fi>, "David S . Miller " <davem@davemloft.net>, Mauro Carvalho Chehab <mchehab+samsung@kernel.org>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Andrew Morton <akpm@linux-foundation.org>, Randy Dunlap <rdunlap@infradead.org>, Linus Walleij <linus.walleij@linaro.org>, Mark Brown <broonie@kernel.org>, Liam Girdwood <lgirdwood@gmail.com>, linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, linux-input@vger.kernel.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 03/10] Input: ams_delta_serio: use private structure Date: Thu, 21 Jun 2018 17:07:39 -0700 [thread overview] Message-ID: <20180622000739.GB79890@dtor-ws> (raw) In-Reply-To: <20180621224128.17623-3-jmkrzyszt@gmail.com> On Fri, Jun 22, 2018 at 12:41:21AM +0200, Janusz Krzysztofik wrote: > Introduce a driver private structure and allocate it on device probe. > For now, use it instead of a static variable for storing a pointer to > serio structure. Subsequent patches will populate it with more members > as needed. > > Signed-off-by: Janusz Krzysztofik <jmkrzyszt@gmail.com> Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> > --- > Changelog: > v2: rebased on v4.18-rc1, no conflicts > > drivers/input/serio/ams_delta_serio.c | 69 ++++++++++++++++++++++------------- > 1 file changed, 43 insertions(+), 26 deletions(-) > > diff --git a/drivers/input/serio/ams_delta_serio.c b/drivers/input/serio/ams_delta_serio.c > index a2a7fa19bf49..551a4fa73fe4 100644 > --- a/drivers/input/serio/ams_delta_serio.c > +++ b/drivers/input/serio/ams_delta_serio.c > @@ -37,17 +37,17 @@ MODULE_AUTHOR("Matt Callow"); > MODULE_DESCRIPTION("AMS Delta (E3) keyboard port driver"); > MODULE_LICENSE("GPL"); > > -static struct serio *ams_delta_serio; > +struct ams_delta_serio { > + struct serio *serio; > +}; > > -static int check_data(int data) > +static int check_data(struct serio *serio, int data) > { > int i, parity = 0; > > /* check valid stop bit */ > if (!(data & 0x400)) { > - dev_warn(&ams_delta_serio->dev, > - "invalid stop bit, data=0x%X\n", > - data); > + dev_warn(&serio->dev, "invalid stop bit, data=0x%X\n", data); > return SERIO_FRAME; > } > /* calculate the parity */ > @@ -57,9 +57,9 @@ static int check_data(int data) > } > /* it should be odd */ > if (!(parity & 0x01)) { > - dev_warn(&ams_delta_serio->dev, > - "parity check failed, data=0x%X parity=0x%X\n", > - data, parity); > + dev_warn(&serio->dev, > + "parity check failed, data=0x%X parity=0x%X\n", data, > + parity); > return SERIO_PARITY; > } > return 0; > @@ -67,6 +67,7 @@ static int check_data(int data) > > static irqreturn_t ams_delta_serio_interrupt(int irq, void *dev_id) > { > + struct ams_delta_serio *priv = dev_id; > int *circ_buff = &fiq_buffer[FIQ_CIRC_BUFF]; > int data, dfl; > u8 scancode; > @@ -84,9 +85,9 @@ static irqreturn_t ams_delta_serio_interrupt(int irq, void *dev_id) > if (fiq_buffer[FIQ_HEAD_OFFSET] == fiq_buffer[FIQ_BUF_LEN]) > fiq_buffer[FIQ_HEAD_OFFSET] = 0; > > - dfl = check_data(data); > + dfl = check_data(priv->serio, data); > scancode = (u8) (data >> 1) & 0xFF; > - serio_interrupt(ams_delta_serio, scancode, dfl); > + serio_interrupt(priv->serio, scancode, dfl); > } > return IRQ_HANDLED; > } > @@ -130,21 +131,14 @@ static const struct gpio ams_delta_gpios[] __initconst_or_module = { > > static int ams_delta_serio_init(struct platform_device *pdev) > { > + struct ams_delta_serio *priv; > + struct serio *serio; > int err; > > - ams_delta_serio = kzalloc(sizeof(struct serio), GFP_KERNEL); > - if (!ams_delta_serio) > + priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); > + if (!priv) > return -ENOMEM; > > - ams_delta_serio->id.type = SERIO_8042; > - ams_delta_serio->open = ams_delta_serio_open; > - ams_delta_serio->close = ams_delta_serio_close; > - strlcpy(ams_delta_serio->name, "AMS DELTA keyboard adapter", > - sizeof(ams_delta_serio->name)); > - strlcpy(ams_delta_serio->phys, dev_name(&pdev->dev), > - sizeof(ams_delta_serio->phys)); > - ams_delta_serio->dev.parent = &pdev->dev; > - > err = gpio_request_array(ams_delta_gpios, > ARRAY_SIZE(ams_delta_gpios)); > if (err) { > @@ -154,7 +148,7 @@ static int ams_delta_serio_init(struct platform_device *pdev) > > err = request_irq(gpio_to_irq(AMS_DELTA_GPIO_PIN_KEYBRD_CLK), > ams_delta_serio_interrupt, IRQ_TYPE_EDGE_RISING, > - DRIVER_NAME, 0); > + DRIVER_NAME, priv); > if (err < 0) { > dev_err(&pdev->dev, "IRQ request failed (%d)\n", err); > goto gpio; > @@ -167,21 +161,44 @@ static int ams_delta_serio_init(struct platform_device *pdev) > irq_set_handler(gpio_to_irq(AMS_DELTA_GPIO_PIN_KEYBRD_CLK), > handle_simple_irq); > > - serio_register_port(ams_delta_serio); > - dev_info(&ams_delta_serio->dev, "%s\n", ams_delta_serio->name); > + serio = kzalloc(sizeof(*serio), GFP_KERNEL); > + if (!serio) { > + err = -ENOMEM; > + goto irq; > + } > + > + priv->serio = serio; > + > + serio->id.type = SERIO_8042; > + serio->open = ams_delta_serio_open; > + serio->close = ams_delta_serio_close; > + strlcpy(serio->name, "AMS DELTA keyboard adapter", sizeof(serio->name)); > + strlcpy(serio->phys, dev_name(&pdev->dev), sizeof(serio->phys)); > + serio->dev.parent = &pdev->dev; > + serio->port_data = priv; > + > + serio_register_port(serio); > + > + platform_set_drvdata(pdev, priv); > + > + dev_info(&serio->dev, "%s\n", serio->name); > > return 0; > + > +irq: > + free_irq(gpio_to_irq(AMS_DELTA_GPIO_PIN_KEYBRD_CLK), priv); > gpio: > gpio_free_array(ams_delta_gpios, > ARRAY_SIZE(ams_delta_gpios)); > serio: > - kfree(ams_delta_serio); > return err; > } > > static int ams_delta_serio_exit(struct platform_device *pdev) > { > - serio_unregister_port(ams_delta_serio); > + struct ams_delta_serio *priv = platform_get_drvdata(pdev); > + > + serio_unregister_port(priv->serio); > free_irq(gpio_to_irq(AMS_DELTA_GPIO_PIN_KEYBRD_CLK), 0); > gpio_free_array(ams_delta_gpios, > ARRAY_SIZE(ams_delta_gpios)); > -- > 2.16.4 > -- Dmitry
WARNING: multiple messages have this Message-ID (diff)
From: dmitry.torokhov@gmail.com (Dmitry Torokhov) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 03/10] Input: ams_delta_serio: use private structure Date: Thu, 21 Jun 2018 17:07:39 -0700 [thread overview] Message-ID: <20180622000739.GB79890@dtor-ws> (raw) In-Reply-To: <20180621224128.17623-3-jmkrzyszt@gmail.com> On Fri, Jun 22, 2018 at 12:41:21AM +0200, Janusz Krzysztofik wrote: > Introduce a driver private structure and allocate it on device probe. > For now, use it instead of a static variable for storing a pointer to > serio structure. Subsequent patches will populate it with more members > as needed. > > Signed-off-by: Janusz Krzysztofik <jmkrzyszt@gmail.com> Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> > --- > Changelog: > v2: rebased on v4.18-rc1, no conflicts > > drivers/input/serio/ams_delta_serio.c | 69 ++++++++++++++++++++++------------- > 1 file changed, 43 insertions(+), 26 deletions(-) > > diff --git a/drivers/input/serio/ams_delta_serio.c b/drivers/input/serio/ams_delta_serio.c > index a2a7fa19bf49..551a4fa73fe4 100644 > --- a/drivers/input/serio/ams_delta_serio.c > +++ b/drivers/input/serio/ams_delta_serio.c > @@ -37,17 +37,17 @@ MODULE_AUTHOR("Matt Callow"); > MODULE_DESCRIPTION("AMS Delta (E3) keyboard port driver"); > MODULE_LICENSE("GPL"); > > -static struct serio *ams_delta_serio; > +struct ams_delta_serio { > + struct serio *serio; > +}; > > -static int check_data(int data) > +static int check_data(struct serio *serio, int data) > { > int i, parity = 0; > > /* check valid stop bit */ > if (!(data & 0x400)) { > - dev_warn(&ams_delta_serio->dev, > - "invalid stop bit, data=0x%X\n", > - data); > + dev_warn(&serio->dev, "invalid stop bit, data=0x%X\n", data); > return SERIO_FRAME; > } > /* calculate the parity */ > @@ -57,9 +57,9 @@ static int check_data(int data) > } > /* it should be odd */ > if (!(parity & 0x01)) { > - dev_warn(&ams_delta_serio->dev, > - "parity check failed, data=0x%X parity=0x%X\n", > - data, parity); > + dev_warn(&serio->dev, > + "parity check failed, data=0x%X parity=0x%X\n", data, > + parity); > return SERIO_PARITY; > } > return 0; > @@ -67,6 +67,7 @@ static int check_data(int data) > > static irqreturn_t ams_delta_serio_interrupt(int irq, void *dev_id) > { > + struct ams_delta_serio *priv = dev_id; > int *circ_buff = &fiq_buffer[FIQ_CIRC_BUFF]; > int data, dfl; > u8 scancode; > @@ -84,9 +85,9 @@ static irqreturn_t ams_delta_serio_interrupt(int irq, void *dev_id) > if (fiq_buffer[FIQ_HEAD_OFFSET] == fiq_buffer[FIQ_BUF_LEN]) > fiq_buffer[FIQ_HEAD_OFFSET] = 0; > > - dfl = check_data(data); > + dfl = check_data(priv->serio, data); > scancode = (u8) (data >> 1) & 0xFF; > - serio_interrupt(ams_delta_serio, scancode, dfl); > + serio_interrupt(priv->serio, scancode, dfl); > } > return IRQ_HANDLED; > } > @@ -130,21 +131,14 @@ static const struct gpio ams_delta_gpios[] __initconst_or_module = { > > static int ams_delta_serio_init(struct platform_device *pdev) > { > + struct ams_delta_serio *priv; > + struct serio *serio; > int err; > > - ams_delta_serio = kzalloc(sizeof(struct serio), GFP_KERNEL); > - if (!ams_delta_serio) > + priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); > + if (!priv) > return -ENOMEM; > > - ams_delta_serio->id.type = SERIO_8042; > - ams_delta_serio->open = ams_delta_serio_open; > - ams_delta_serio->close = ams_delta_serio_close; > - strlcpy(ams_delta_serio->name, "AMS DELTA keyboard adapter", > - sizeof(ams_delta_serio->name)); > - strlcpy(ams_delta_serio->phys, dev_name(&pdev->dev), > - sizeof(ams_delta_serio->phys)); > - ams_delta_serio->dev.parent = &pdev->dev; > - > err = gpio_request_array(ams_delta_gpios, > ARRAY_SIZE(ams_delta_gpios)); > if (err) { > @@ -154,7 +148,7 @@ static int ams_delta_serio_init(struct platform_device *pdev) > > err = request_irq(gpio_to_irq(AMS_DELTA_GPIO_PIN_KEYBRD_CLK), > ams_delta_serio_interrupt, IRQ_TYPE_EDGE_RISING, > - DRIVER_NAME, 0); > + DRIVER_NAME, priv); > if (err < 0) { > dev_err(&pdev->dev, "IRQ request failed (%d)\n", err); > goto gpio; > @@ -167,21 +161,44 @@ static int ams_delta_serio_init(struct platform_device *pdev) > irq_set_handler(gpio_to_irq(AMS_DELTA_GPIO_PIN_KEYBRD_CLK), > handle_simple_irq); > > - serio_register_port(ams_delta_serio); > - dev_info(&ams_delta_serio->dev, "%s\n", ams_delta_serio->name); > + serio = kzalloc(sizeof(*serio), GFP_KERNEL); > + if (!serio) { > + err = -ENOMEM; > + goto irq; > + } > + > + priv->serio = serio; > + > + serio->id.type = SERIO_8042; > + serio->open = ams_delta_serio_open; > + serio->close = ams_delta_serio_close; > + strlcpy(serio->name, "AMS DELTA keyboard adapter", sizeof(serio->name)); > + strlcpy(serio->phys, dev_name(&pdev->dev), sizeof(serio->phys)); > + serio->dev.parent = &pdev->dev; > + serio->port_data = priv; > + > + serio_register_port(serio); > + > + platform_set_drvdata(pdev, priv); > + > + dev_info(&serio->dev, "%s\n", serio->name); > > return 0; > + > +irq: > + free_irq(gpio_to_irq(AMS_DELTA_GPIO_PIN_KEYBRD_CLK), priv); > gpio: > gpio_free_array(ams_delta_gpios, > ARRAY_SIZE(ams_delta_gpios)); > serio: > - kfree(ams_delta_serio); > return err; > } > > static int ams_delta_serio_exit(struct platform_device *pdev) > { > - serio_unregister_port(ams_delta_serio); > + struct ams_delta_serio *priv = platform_get_drvdata(pdev); > + > + serio_unregister_port(priv->serio); > free_irq(gpio_to_irq(AMS_DELTA_GPIO_PIN_KEYBRD_CLK), 0); > gpio_free_array(ams_delta_gpios, > ARRAY_SIZE(ams_delta_gpios)); > -- > 2.16.4 > -- Dmitry
next prev parent reply other threads:[~2018-06-22 0:07 UTC|newest] Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-06-09 14:02 [PATCH 01/10] ARM: OMAP1: ams-delta: drop GPIO lookup table for serio device Janusz Krzysztofik 2018-06-09 14:02 ` Janusz Krzysztofik 2018-06-09 14:02 ` [PATCH 02/10] Input: ams_delta_serio: convert to platform driver Janusz Krzysztofik 2018-06-09 14:02 ` Janusz Krzysztofik 2018-06-09 14:02 ` [PATCH 03/10] Input: ams_delta_serio: use private structure Janusz Krzysztofik 2018-06-09 14:02 ` Janusz Krzysztofik 2018-06-09 14:02 ` [PATCH 04/10] Input: ams_delta_serio: Replace power GPIO with regulator Janusz Krzysztofik 2018-06-09 14:02 ` Janusz Krzysztofik 2018-06-12 22:17 ` Dmitry Torokhov 2018-06-12 22:17 ` Dmitry Torokhov 2018-06-13 1:01 ` Janusz Krzysztofik 2018-06-13 1:01 ` Janusz Krzysztofik 2018-06-13 20:51 ` Dmitry Torokhov 2018-06-13 20:51 ` Dmitry Torokhov 2018-06-14 22:16 ` [PATCH 4/10 v2] " Janusz Krzysztofik 2018-06-14 22:16 ` Janusz Krzysztofik 2018-06-09 14:02 ` [PATCH 05/10] ARM: OMAP1: ams-delta: Hog "keybrd_dataout" GPIO pin Janusz Krzysztofik 2018-06-09 14:02 ` Janusz Krzysztofik 2018-06-09 14:02 ` [PATCH 06/10] ARM: OMAP1: ams-delta FIQ: don't use static GPIO numbers Janusz Krzysztofik 2018-06-09 14:02 ` Janusz Krzysztofik 2018-06-14 8:45 ` Linus Walleij 2018-06-14 8:45 ` Linus Walleij 2018-06-09 14:02 ` [PATCH 07/10] ARM: OMAP1: ams-delta FIQ: Keep serio input GPIOs requested Janusz Krzysztofik 2018-06-09 14:02 ` Janusz Krzysztofik 2018-06-09 14:02 ` [PATCH 08/10] ARM: OMAP1: Get rid of <mach/ams-delta-fiq.h> Janusz Krzysztofik 2018-06-09 14:02 ` Janusz Krzysztofik 2018-06-09 14:02 ` [PATCH 09/10] Input: ams_delta_serio: use IRQ resource Janusz Krzysztofik 2018-06-09 14:02 ` Janusz Krzysztofik 2018-06-12 22:21 ` Dmitry Torokhov 2018-06-12 22:21 ` Dmitry Torokhov 2018-06-13 1:10 ` Janusz Krzysztofik 2018-06-13 1:10 ` Janusz Krzysztofik 2018-06-09 14:02 ` [PATCH 10/10] Input: ams_delta_serio: Get FIQ buffer from platform_data Janusz Krzysztofik 2018-06-09 14:02 ` Janusz Krzysztofik 2018-06-12 22:23 ` [PATCH 01/10] ARM: OMAP1: ams-delta: drop GPIO lookup table for serio device Dmitry Torokhov 2018-06-12 22:23 ` Dmitry Torokhov 2018-06-13 1:16 ` Janusz Krzysztofik 2018-06-13 1:16 ` Janusz Krzysztofik 2018-06-13 4:41 ` Tony Lindgren 2018-06-13 4:41 ` Tony Lindgren 2018-06-19 6:50 ` Tony Lindgren 2018-06-19 6:50 ` Tony Lindgren 2018-06-19 6:50 ` Tony Lindgren 2018-06-21 22:41 ` [PATCH v2 " Janusz Krzysztofik 2018-06-21 22:41 ` Janusz Krzysztofik 2018-06-21 22:41 ` [PATCH v2 02/10] Input: ams_delta_serio: convert to platform driver Janusz Krzysztofik 2018-06-21 22:41 ` Janusz Krzysztofik 2018-06-22 0:05 ` Dmitry Torokhov 2018-06-22 0:05 ` Dmitry Torokhov 2018-06-21 22:41 ` [PATCH v2 03/10] Input: ams_delta_serio: use private structure Janusz Krzysztofik 2018-06-21 22:41 ` Janusz Krzysztofik 2018-06-22 0:07 ` Dmitry Torokhov [this message] 2018-06-22 0:07 ` Dmitry Torokhov 2018-06-21 22:41 ` [PATCH v2 04/10] Input: ams_delta_serio: Replace power GPIO with regulator Janusz Krzysztofik 2018-06-21 22:41 ` Janusz Krzysztofik 2018-06-22 0:09 ` Dmitry Torokhov 2018-06-22 0:09 ` Dmitry Torokhov 2018-06-21 22:41 ` [PATCH v2 05/10] ARM: OMAP1: ams-delta: Hog "keybrd_dataout" GPIO pin Janusz Krzysztofik 2018-06-21 22:41 ` Janusz Krzysztofik 2018-06-21 22:41 ` [PATCH v2 06/10] ARM: OMAP1: ams-delta FIQ: don't use static GPIO numbers Janusz Krzysztofik 2018-06-21 22:41 ` Janusz Krzysztofik 2018-07-02 12:56 ` Tony Lindgren 2018-07-02 12:56 ` Tony Lindgren 2018-06-21 22:41 ` [PATCH v2 07/10] ARM: OMAP1: ams-delta FIQ: Keep serio input GPIOs requested Janusz Krzysztofik 2018-06-21 22:41 ` Janusz Krzysztofik 2018-06-21 22:41 ` Janusz Krzysztofik 2018-06-22 0:10 ` Dmitry Torokhov 2018-06-22 0:10 ` Dmitry Torokhov 2018-06-21 22:41 ` [PATCH v2 08/10] ARM: OMAP1: Get rid of <mach/ams-delta-fiq.h> Janusz Krzysztofik 2018-06-21 22:41 ` Janusz Krzysztofik 2018-06-22 0:10 ` Dmitry Torokhov 2018-06-22 0:10 ` Dmitry Torokhov 2018-06-21 22:41 ` [PATCH v2 09/10] Input: ams_delta_serio: use IRQ resource Janusz Krzysztofik 2018-06-21 22:41 ` Janusz Krzysztofik 2018-06-22 0:11 ` Dmitry Torokhov 2018-06-22 0:11 ` Dmitry Torokhov 2018-06-21 22:41 ` [PATCH v2 10/10] Input: ams_delta_serio: Get FIQ buffer from platform_data Janusz Krzysztofik 2018-06-21 22:41 ` Janusz Krzysztofik 2018-06-22 0:11 ` Dmitry Torokhov 2018-06-22 0:11 ` Dmitry Torokhov
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180622000739.GB79890@dtor-ws \ --to=dmitry.torokhov@gmail.com \ --cc=aaro.koskinen@iki.fi \ --cc=akpm@linux-foundation.org \ --cc=broonie@kernel.org \ --cc=davem@davemloft.net \ --cc=gregkh@linuxfoundation.org \ --cc=jmkrzyszt@gmail.com \ --cc=lgirdwood@gmail.com \ --cc=linus.walleij@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-gpio@vger.kernel.org \ --cc=linux-input@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=mchehab+samsung@kernel.org \ --cc=rdunlap@infradead.org \ --cc=tony@atomide.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.