* [PATCH 0/2] Few pinctrl-single clean-ups
@ 2016-10-25 16:08 Tony Lindgren
2016-10-25 16:08 ` [PATCH 1/2] pinctrl: single: Drop custom names Tony Lindgren
` (2 more replies)
0 siblings, 3 replies; 12+ messages in thread
From: Tony Lindgren @ 2016-10-25 16:08 UTC (permalink / raw)
To: Linus Walleij
Cc: Haojian Zhuang, Grygorii Strashko, Nishanth Menon, linux-gpio,
linux-omap
Hi,
In preparation for some more generic pinctrl changes, here are two clean-up
patches for pinctrl-single.
Regards,
Tony
Tony Lindgren (2):
pinctrl: single: Drop custom names
pinctrl: single: Drop pointless macro
drivers/pinctrl/pinctrl-single.c | 53 +++++++++-------------------------------
1 file changed, 12 insertions(+), 41 deletions(-)
--
2.9.3
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH 1/2] pinctrl: single: Drop custom names 2016-10-25 16:08 [PATCH 0/2] Few pinctrl-single clean-ups Tony Lindgren @ 2016-10-25 16:08 ` Tony Lindgren 2016-10-26 14:17 ` Tony Lindgren 2016-10-25 16:09 ` [PATCH 2/2] pinctrl: single: Drop pointless macro Tony Lindgren 2016-10-27 8:16 ` [PATCH 0/2] Few pinctrl-single clean-ups Linus Walleij 2 siblings, 1 reply; 12+ messages in thread From: Tony Lindgren @ 2016-10-25 16:08 UTC (permalink / raw) To: Linus Walleij Cc: Haojian Zhuang, Grygorii Strashko, Nishanth Menon, linux-gpio, linux-omap We no longer need to allocate custom names as those are dynamically generated in pinctrl_register_one_pin() if no name is passed to pinctrl_register_pins(). Signed-off-by: Tony Lindgren <tony@atomide.com> --- drivers/pinctrl/pinctrl-single.c | 35 +++++------------------------------ 1 file changed, 5 insertions(+), 30 deletions(-) diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c --- a/drivers/pinctrl/pinctrl-single.c +++ b/drivers/pinctrl/pinctrl-single.c @@ -36,7 +36,6 @@ #define DRIVER_NAME "pinctrl-single" #define PCS_MUX_PINS_NAME "pinctrl-single,pins" #define PCS_MUX_BITS_NAME "pinctrl-single,bits" -#define PCS_REG_NAME_LEN ((sizeof(unsigned long) * 2) + 3) #define PCS_OFF_DISABLED ~0U /** @@ -142,20 +141,6 @@ struct pcs_data { }; /** - * struct pcs_name - register name for a pin - * @name: name of the pinctrl register - * - * REVISIT: We may want to make names optional in the pinctrl - * framework as some drivers may not care about pin names to - * avoid kernel bloat. The pin names can be deciphered by user - * space tools using debugfs based on the register address and - * SoC packaging information. - */ -struct pcs_name { - char name[PCS_REG_NAME_LEN]; -}; - -/** * struct pcs_soc_data - SoC specific settings * @flags: initial SoC specific PCS_FEAT_xxx values * @irq: optional interrupt for the controller @@ -187,7 +172,6 @@ struct pcs_soc_data { * @foff: value to turn mux off * @fmax: max number of functions in fmask * @bits_per_pin:number of bits per pin - * @names: array of register names for pins * @pins: physical pins on the SoC * @pgtree: pingroup index radix tree * @ftree: function index radix tree @@ -223,7 +207,6 @@ struct pcs_device { unsigned fmax; bool bits_per_mux; unsigned bits_per_pin; - struct pcs_name *names; struct pcs_data pins; struct radix_tree_root pgtree; struct radix_tree_root ftree; @@ -354,13 +337,16 @@ static void pcs_pin_dbg_show(struct pinctrl_dev *pctldev, { struct pcs_device *pcs; unsigned val, mux_bytes; + unsigned long offset; pcs = pinctrl_dev_get_drvdata(pctldev); mux_bytes = pcs->width / BITS_PER_BYTE; - val = pcs->read(pcs->base + pin * mux_bytes); + offset = pin * mux_bytes; + val = pcs->read(pcs->base + offset); - seq_printf(s, "%08x %s " , val, DRIVER_NAME); + seq_printf(s, "%lx %08x %s ", pcs->res->start + offset, val, + DRIVER_NAME); } static void pcs_dt_free_map(struct pinctrl_dev *pctldev, @@ -763,7 +749,6 @@ static int pcs_add_pin(struct pcs_device *pcs, unsigned offset, { struct pcs_soc_data *pcs_soc = &pcs->socdata; struct pinctrl_pin_desc *pin; - struct pcs_name *pn; int i; i = pcs->pins.cur; @@ -786,10 +771,6 @@ static int pcs_add_pin(struct pcs_device *pcs, unsigned offset, } pin = &pcs->pins.pa[i]; - pn = &pcs->names[i]; - sprintf(pn->name, "%lx.%u", - (unsigned long)pcs->res->start + offset, pin_pos); - pin->name = pn->name; pin->number = i; pcs->pins.cur++; @@ -827,12 +808,6 @@ static int pcs_allocate_pin_table(struct pcs_device *pcs) if (!pcs->pins.pa) return -ENOMEM; - pcs->names = devm_kzalloc(pcs->dev, - sizeof(struct pcs_name) * nr_pins, - GFP_KERNEL); - if (!pcs->names) - return -ENOMEM; - pcs->desc.pins = pcs->pins.pa; pcs->desc.npins = nr_pins; -- 2.9.3 ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/2] pinctrl: single: Drop custom names 2016-10-25 16:08 ` [PATCH 1/2] pinctrl: single: Drop custom names Tony Lindgren @ 2016-10-26 14:17 ` Tony Lindgren 2016-10-27 14:59 ` Tony Lindgren 0 siblings, 1 reply; 12+ messages in thread From: Tony Lindgren @ 2016-10-26 14:17 UTC (permalink / raw) To: Linus Walleij Cc: Haojian Zhuang, Grygorii Strashko, Nishanth Menon, linux-gpio, linux-omap * Tony Lindgren <tony@atomide.com> [161025 09:10]: > We no longer need to allocate custom names as those are dynamically > generated in pinctrl_register_one_pin() if no name is passed to > pinctrl_register_pins(). ... > @@ -354,13 +337,16 @@ static void pcs_pin_dbg_show(struct pinctrl_dev *pctldev, > { > struct pcs_device *pcs; > unsigned val, mux_bytes; > + unsigned long offset; > > pcs = pinctrl_dev_get_drvdata(pctldev); > > mux_bytes = pcs->width / BITS_PER_BYTE; > - val = pcs->read(pcs->base + pin * mux_bytes); > + offset = pin * mux_bytes; > + val = pcs->read(pcs->base + offset); > > - seq_printf(s, "%08x %s " , val, DRIVER_NAME); > + seq_printf(s, "%lx %08x %s ", pcs->res->start + offset, val, > + DRIVER_NAME); > } This should use %zx instead of %lx to avoid build warnings on 64-bit systems as reported by kbuild test robot. Regards, Tony ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/2] pinctrl: single: Drop custom names 2016-10-26 14:17 ` Tony Lindgren @ 2016-10-27 14:59 ` Tony Lindgren 0 siblings, 0 replies; 12+ messages in thread From: Tony Lindgren @ 2016-10-27 14:59 UTC (permalink / raw) To: Linus Walleij Cc: Haojian Zhuang, Grygorii Strashko, Nishanth Menon, linux-gpio, linux-omap * Tony Lindgren <tony@atomide.com> [161026 07:19]: > * Tony Lindgren <tony@atomide.com> [161025 09:10]: > > We no longer need to allocate custom names as those are dynamically > > generated in pinctrl_register_one_pin() if no name is passed to > > pinctrl_register_pins(). > ... > > > @@ -354,13 +337,16 @@ static void pcs_pin_dbg_show(struct pinctrl_dev *pctldev, > > { > > struct pcs_device *pcs; > > unsigned val, mux_bytes; > > + unsigned long offset; > > > > pcs = pinctrl_dev_get_drvdata(pctldev); > > > > mux_bytes = pcs->width / BITS_PER_BYTE; > > - val = pcs->read(pcs->base + pin * mux_bytes); > > + offset = pin * mux_bytes; > > + val = pcs->read(pcs->base + offset); > > > > - seq_printf(s, "%08x %s " , val, DRIVER_NAME); > > + seq_printf(s, "%lx %08x %s ", pcs->res->start + offset, val, > > + DRIVER_NAME); > > } > > This should use %zx instead of %lx to avoid build warnings on 64-bit > systems as reported by kbuild test robot. Below is an updated version of this patch. Regards, Tony 8< --------------------------- >From tony Mon Sep 17 00:00:00 2001 From: Tony Lindgren <tony@atomide.com> Date: Tue, 25 Oct 2016 08:33:34 -0700 Subject: [PATCHv2] pinctrl: single: Drop custom names We no longer need to allocate custom names as those are dynamically generated in pinctrl_register_one_pin() if no name is passed to pinctrl_register_pins(). Signed-off-by: Tony Lindgren <tony@atomide.com> --- Use %z instead of %l for 64-bit systems --- drivers/pinctrl/pinctrl-single.c | 36 ++++++------------------------------ 1 file changed, 6 insertions(+), 30 deletions(-) diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c --- a/drivers/pinctrl/pinctrl-single.c +++ b/drivers/pinctrl/pinctrl-single.c @@ -36,7 +36,6 @@ #define DRIVER_NAME "pinctrl-single" #define PCS_MUX_PINS_NAME "pinctrl-single,pins" #define PCS_MUX_BITS_NAME "pinctrl-single,bits" -#define PCS_REG_NAME_LEN ((sizeof(unsigned long) * 2) + 3) #define PCS_OFF_DISABLED ~0U /** @@ -142,20 +141,6 @@ struct pcs_data { }; /** - * struct pcs_name - register name for a pin - * @name: name of the pinctrl register - * - * REVISIT: We may want to make names optional in the pinctrl - * framework as some drivers may not care about pin names to - * avoid kernel bloat. The pin names can be deciphered by user - * space tools using debugfs based on the register address and - * SoC packaging information. - */ -struct pcs_name { - char name[PCS_REG_NAME_LEN]; -}; - -/** * struct pcs_soc_data - SoC specific settings * @flags: initial SoC specific PCS_FEAT_xxx values * @irq: optional interrupt for the controller @@ -187,7 +172,6 @@ struct pcs_soc_data { * @foff: value to turn mux off * @fmax: max number of functions in fmask * @bits_per_pin:number of bits per pin - * @names: array of register names for pins * @pins: physical pins on the SoC * @pgtree: pingroup index radix tree * @ftree: function index radix tree @@ -223,7 +207,6 @@ struct pcs_device { unsigned fmax; bool bits_per_mux; unsigned bits_per_pin; - struct pcs_name *names; struct pcs_data pins; struct radix_tree_root pgtree; struct radix_tree_root ftree; @@ -354,13 +337,17 @@ static void pcs_pin_dbg_show(struct pinctrl_dev *pctldev, { struct pcs_device *pcs; unsigned val, mux_bytes; + unsigned long offset; + size_t pa; pcs = pinctrl_dev_get_drvdata(pctldev); mux_bytes = pcs->width / BITS_PER_BYTE; - val = pcs->read(pcs->base + pin * mux_bytes); + offset = pin * mux_bytes; + val = pcs->read(pcs->base + offset); + pa = pcs->res->start + offset; - seq_printf(s, "%08x %s " , val, DRIVER_NAME); + seq_printf(s, "%zx %08x %s ", pa, val, DRIVER_NAME); } static void pcs_dt_free_map(struct pinctrl_dev *pctldev, @@ -763,7 +750,6 @@ static int pcs_add_pin(struct pcs_device *pcs, unsigned offset, { struct pcs_soc_data *pcs_soc = &pcs->socdata; struct pinctrl_pin_desc *pin; - struct pcs_name *pn; int i; i = pcs->pins.cur; @@ -786,10 +772,6 @@ static int pcs_add_pin(struct pcs_device *pcs, unsigned offset, } pin = &pcs->pins.pa[i]; - pn = &pcs->names[i]; - sprintf(pn->name, "%lx.%u", - (unsigned long)pcs->res->start + offset, pin_pos); - pin->name = pn->name; pin->number = i; pcs->pins.cur++; @@ -827,12 +809,6 @@ static int pcs_allocate_pin_table(struct pcs_device *pcs) if (!pcs->pins.pa) return -ENOMEM; - pcs->names = devm_kzalloc(pcs->dev, - sizeof(struct pcs_name) * nr_pins, - GFP_KERNEL); - if (!pcs->names) - return -ENOMEM; - pcs->desc.pins = pcs->pins.pa; pcs->desc.npins = nr_pins; -- 2.9.3 ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 2/2] pinctrl: single: Drop pointless macro 2016-10-25 16:08 [PATCH 0/2] Few pinctrl-single clean-ups Tony Lindgren 2016-10-25 16:08 ` [PATCH 1/2] pinctrl: single: Drop custom names Tony Lindgren @ 2016-10-25 16:09 ` Tony Lindgren 2016-10-28 11:54 ` Linus Walleij 2016-10-27 8:16 ` [PATCH 0/2] Few pinctrl-single clean-ups Linus Walleij 2 siblings, 1 reply; 12+ messages in thread From: Tony Lindgren @ 2016-10-25 16:09 UTC (permalink / raw) To: Linus Walleij Cc: Haojian Zhuang, Grygorii Strashko, Nishanth Menon, linux-gpio, linux-omap This is left over from initial experiments with more properties. It's only used in one place, so let's just get rid of it to make the code more readable. Signed-off-by: Tony Lindgren <tony@atomide.com> --- drivers/pinctrl/pinctrl-single.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c --- a/drivers/pinctrl/pinctrl-single.c +++ b/drivers/pinctrl/pinctrl-single.c @@ -1471,15 +1471,6 @@ static void pcs_free_resources(struct pcs_device *pcs) pcs_free_pingroups(pcs); } -#define PCS_GET_PROP_U32(name, reg, err) \ - do { \ - ret = of_property_read_u32(np, name, reg); \ - if (ret) { \ - dev_err(pcs->dev, err); \ - return ret; \ - } \ - } while (0); - static const struct of_device_id pcs_of_match[]; static int pcs_add_gpio_func(struct device_node *node, struct pcs_device *pcs) @@ -1824,8 +1815,13 @@ static int pcs_probe(struct platform_device *pdev) pcs->flags = soc->flags; memcpy(&pcs->socdata, soc, sizeof(*soc)); - PCS_GET_PROP_U32("pinctrl-single,register-width", &pcs->width, - "register width not specified\n"); + ret = of_property_read_u32(np, "pinctrl-single,register-width", + &pcs->width); + if (ret) { + dev_err(pcs->dev, "register width not specified\n"); + + return ret; + } ret = of_property_read_u32(np, "pinctrl-single,function-mask", &pcs->fmask); -- 2.9.3 ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/2] pinctrl: single: Drop pointless macro 2016-10-25 16:09 ` [PATCH 2/2] pinctrl: single: Drop pointless macro Tony Lindgren @ 2016-10-28 11:54 ` Linus Walleij 0 siblings, 0 replies; 12+ messages in thread From: Linus Walleij @ 2016-10-28 11:54 UTC (permalink / raw) To: Tony Lindgren Cc: Haojian Zhuang, Grygorii Strashko, Nishanth Menon, linux-gpio@vger.kernel.org, Linux-OMAP On Tue, Oct 25, 2016 at 6:09 PM, Tony Lindgren <tony@atomide.com> wrote: > This is left over from initial experiments with more properties. > It's only used in one place, so let's just get rid of it to make > the code more readable. > > Signed-off-by: Tony Lindgren <tony@atomide.com> Patch applied. Yours, Linus Walleij ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 0/2] Few pinctrl-single clean-ups 2016-10-25 16:08 [PATCH 0/2] Few pinctrl-single clean-ups Tony Lindgren 2016-10-25 16:08 ` [PATCH 1/2] pinctrl: single: Drop custom names Tony Lindgren 2016-10-25 16:09 ` [PATCH 2/2] pinctrl: single: Drop pointless macro Tony Lindgren @ 2016-10-27 8:16 ` Linus Walleij 2016-10-27 15:00 ` Tony Lindgren 2 siblings, 1 reply; 12+ messages in thread From: Linus Walleij @ 2016-10-27 8:16 UTC (permalink / raw) To: Tony Lindgren Cc: Haojian Zhuang, Grygorii Strashko, Nishanth Menon, linux-gpio@vger.kernel.org, Linux-OMAP On Tue, Oct 25, 2016 at 6:08 PM, Tony Lindgren <tony@atomide.com> wrote: > In preparation for some more generic pinctrl changes, here are two clean-up > patches for pinctrl-single. Can you respin the first patch so I can merge these two? Linus ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 0/2] Few pinctrl-single clean-ups 2016-10-27 8:16 ` [PATCH 0/2] Few pinctrl-single clean-ups Linus Walleij @ 2016-10-27 15:00 ` Tony Lindgren 2016-10-27 20:15 ` Linus Walleij 0 siblings, 1 reply; 12+ messages in thread From: Tony Lindgren @ 2016-10-27 15:00 UTC (permalink / raw) To: Linus Walleij Cc: Haojian Zhuang, Grygorii Strashko, Nishanth Menon, linux-gpio@vger.kernel.org, Linux-OMAP * Linus Walleij <linus.walleij@linaro.org> [161027 01:17]: > On Tue, Oct 25, 2016 at 6:08 PM, Tony Lindgren <tony@atomide.com> wrote: > > > In preparation for some more generic pinctrl changes, here are two clean-up > > patches for pinctrl-single. > > Can you respin the first patch so I can merge these two? OK posted as a reply that to it that should apply with git-am --scissors. Let me know if you want me to repost the whole thread. Regards, Tony ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 0/2] Few pinctrl-single clean-ups 2016-10-27 15:00 ` Tony Lindgren @ 2016-10-27 20:15 ` Linus Walleij 2016-10-27 21:19 ` Tony Lindgren 0 siblings, 1 reply; 12+ messages in thread From: Linus Walleij @ 2016-10-27 20:15 UTC (permalink / raw) To: Tony Lindgren Cc: Haojian Zhuang, Grygorii Strashko, Nishanth Menon, linux-gpio@vger.kernel.org, Linux-OMAP On Thu, Oct 27, 2016 at 5:00 PM, Tony Lindgren <tony@atomide.com> wrote: > * Linus Walleij <linus.walleij@linaro.org> [161027 01:17]: >> On Tue, Oct 25, 2016 at 6:08 PM, Tony Lindgren <tony@atomide.com> wrote: >> >> > In preparation for some more generic pinctrl changes, here are two clean-up >> > patches for pinctrl-single. >> >> Can you respin the first patch so I can merge these two? > > OK posted as a reply that to it that should apply with > git-am --scissors. Let me know if you want me to repost the whole > thread. I don't see the replies :O I wonder what happened :/ Yours, Linus Walleij ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 0/2] Few pinctrl-single clean-ups 2016-10-27 20:15 ` Linus Walleij @ 2016-10-27 21:19 ` Tony Lindgren 2016-10-28 11:53 ` Linus Walleij 0 siblings, 1 reply; 12+ messages in thread From: Tony Lindgren @ 2016-10-27 21:19 UTC (permalink / raw) To: Linus Walleij Cc: Haojian Zhuang, Grygorii Strashko, Nishanth Menon, linux-gpio@vger.kernel.org, Linux-OMAP * Linus Walleij <linus.walleij@linaro.org> [161027 13:16]: > On Thu, Oct 27, 2016 at 5:00 PM, Tony Lindgren <tony@atomide.com> wrote: > > * Linus Walleij <linus.walleij@linaro.org> [161027 01:17]: > >> On Tue, Oct 25, 2016 at 6:08 PM, Tony Lindgren <tony@atomide.com> wrote: > >> > >> > In preparation for some more generic pinctrl changes, here are two clean-up > >> > patches for pinctrl-single. > >> > >> Can you respin the first patch so I can merge these two? > > > > OK posted as a reply that to it that should apply with > > git-am --scissors. Let me know if you want me to repost the whole > > thread. > > I don't see the replies :O > > I wonder what happened :/ Maybe the delivery got delayed? Seems to be appearing at least in k.o patchwork: https://patchwork.kernel.org/patch/9399687/ Regards, Tony ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 0/2] Few pinctrl-single clean-ups 2016-10-27 21:19 ` Tony Lindgren @ 2016-10-28 11:53 ` Linus Walleij 2016-10-28 12:52 ` Tony Lindgren 0 siblings, 1 reply; 12+ messages in thread From: Linus Walleij @ 2016-10-28 11:53 UTC (permalink / raw) To: Tony Lindgren Cc: Haojian Zhuang, Grygorii Strashko, Nishanth Menon, linux-gpio@vger.kernel.org, Linux-OMAP On Thu, Oct 27, 2016 at 11:19 PM, Tony Lindgren <tony@atomide.com> wrote: >> I wonder what happened :/ > > Maybe the delivery got delayed? Seems to be appearing at least > in k.o patchwork: > > https://patchwork.kernel.org/patch/9399687/ APplied it from patchwork. Yours, Linus Walleij ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 0/2] Few pinctrl-single clean-ups 2016-10-28 11:53 ` Linus Walleij @ 2016-10-28 12:52 ` Tony Lindgren 0 siblings, 0 replies; 12+ messages in thread From: Tony Lindgren @ 2016-10-28 12:52 UTC (permalink / raw) To: Linus Walleij Cc: Haojian Zhuang, Grygorii Strashko, Nishanth Menon, linux-gpio@vger.kernel.org, Linux-OMAP * Linus Walleij <linus.walleij@linaro.org> [161028 04:54]: > On Thu, Oct 27, 2016 at 11:19 PM, Tony Lindgren <tony@atomide.com> wrote: > > >> I wonder what happened :/ > > > > Maybe the delivery got delayed? Seems to be appearing at least > > in k.o patchwork: > > > > https://patchwork.kernel.org/patch/9399687/ > > APplied it from patchwork. OK thanks. Tony ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2016-10-28 12:52 UTC | newest] Thread overview: 12+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-10-25 16:08 [PATCH 0/2] Few pinctrl-single clean-ups Tony Lindgren 2016-10-25 16:08 ` [PATCH 1/2] pinctrl: single: Drop custom names Tony Lindgren 2016-10-26 14:17 ` Tony Lindgren 2016-10-27 14:59 ` Tony Lindgren 2016-10-25 16:09 ` [PATCH 2/2] pinctrl: single: Drop pointless macro Tony Lindgren 2016-10-28 11:54 ` Linus Walleij 2016-10-27 8:16 ` [PATCH 0/2] Few pinctrl-single clean-ups Linus Walleij 2016-10-27 15:00 ` Tony Lindgren 2016-10-27 20:15 ` Linus Walleij 2016-10-27 21:19 ` Tony Lindgren 2016-10-28 11:53 ` Linus Walleij 2016-10-28 12:52 ` Tony Lindgren
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).