Message ID | 20240527212742.1432960-2-andy.shevchenko@gmail.com |
---|---|
State | Superseded |
Headers | show |
Series | pinctrl: pinmux: Embed and reuse struct pinfunction | expand |
Hi Andy, kernel test robot noticed the following build errors: [auto build test ERROR on linusw-pinctrl/devel] [also build test ERROR on linusw-pinctrl/for-next linus/master v6.10-rc1 next-20240523] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Andy-Shevchenko/pinctrl-berlin-Make-use-of-struct-pinfunction/20240528-053304 base: https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git devel patch link: https://lore.kernel.org/r/20240527212742.1432960-2-andy.shevchenko%40gmail.com patch subject: [PATCH v1 01/11] pinctrl: berlin: Make use of struct pinfunction config: hexagon-allmodconfig (https://download.01.org/0day-ci/archive/20240528/202405280810.6djYxvIm-lkp@intel.com/config) compiler: clang version 19.0.0git (https://github.com/llvm/llvm-project bafda89a0944d947fc4b3b5663185e07a397ac30) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240528/202405280810.6djYxvIm-lkp@intel.com/reproduce) If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Closes: https://lore.kernel.org/oe-kbuild-all/202405280810.6djYxvIm-lkp@intel.com/ All errors (new ones prefixed by >>): In file included from drivers/pinctrl/berlin/berlin.c:10: In file included from include/linux/io.h:14: In file included from arch/hexagon/include/asm/io.h:328: include/asm-generic/io.h:548:31: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] 548 | val = __raw_readb(PCI_IOBASE + addr); | ~~~~~~~~~~ ^ include/asm-generic/io.h:561:61: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] 561 | val = __le16_to_cpu((__le16 __force)__raw_readw(PCI_IOBASE + addr)); | ~~~~~~~~~~ ^ include/uapi/linux/byteorder/little_endian.h:37:51: note: expanded from macro '__le16_to_cpu' 37 | #define __le16_to_cpu(x) ((__force __u16)(__le16)(x)) | ^ In file included from drivers/pinctrl/berlin/berlin.c:10: In file included from include/linux/io.h:14: In file included from arch/hexagon/include/asm/io.h:328: include/asm-generic/io.h:574:61: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] 574 | val = __le32_to_cpu((__le32 __force)__raw_readl(PCI_IOBASE + addr)); | ~~~~~~~~~~ ^ include/uapi/linux/byteorder/little_endian.h:35:51: note: expanded from macro '__le32_to_cpu' 35 | #define __le32_to_cpu(x) ((__force __u32)(__le32)(x)) | ^ In file included from drivers/pinctrl/berlin/berlin.c:10: In file included from include/linux/io.h:14: In file included from arch/hexagon/include/asm/io.h:328: include/asm-generic/io.h:585:33: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] 585 | __raw_writeb(value, PCI_IOBASE + addr); | ~~~~~~~~~~ ^ include/asm-generic/io.h:595:59: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] 595 | __raw_writew((u16 __force)cpu_to_le16(value), PCI_IOBASE + addr); | ~~~~~~~~~~ ^ include/asm-generic/io.h:605:59: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic] 605 | __raw_writel((u32 __force)cpu_to_le32(value), PCI_IOBASE + addr); | ~~~~~~~~~~ ^ >> drivers/pinctrl/berlin/berlin.c:261:45: error: passing 'const char *const *' to parameter of type 'void *' discards qualifiers [-Werror,-Wincompatible-pointer-types-discards-qualifiers] 261 | groups = devm_krealloc_array(&pdev->dev, function->groups, | ^~~~~~~~~~~~~~~~ include/linux/device.h:346:47: note: passing argument to parameter 'p' here 346 | devm_krealloc_array(struct device *dev, void *p, size_t new_n, size_t new_size, gfp_t flags) | ^ 6 warnings and 1 error generated. vim +261 drivers/pinctrl/berlin/berlin.c 200 201 static int berlin_pinctrl_build_state(struct platform_device *pdev) 202 { 203 struct berlin_pinctrl *pctrl = platform_get_drvdata(pdev); 204 const struct berlin_desc_group *desc_group; 205 const struct berlin_desc_function *desc_function; 206 int i, max_functions = 0; 207 208 pctrl->nfunctions = 0; 209 210 for (i = 0; i < pctrl->desc->ngroups; i++) { 211 desc_group = pctrl->desc->groups + i; 212 /* compute the maximum number of functions a group can have */ 213 max_functions += 1 << (desc_group->bit_width + 1); 214 } 215 216 /* we will reallocate later */ 217 pctrl->functions = kcalloc(max_functions, sizeof(*pctrl->functions), GFP_KERNEL); 218 if (!pctrl->functions) 219 return -ENOMEM; 220 221 /* register all functions */ 222 for (i = 0; i < pctrl->desc->ngroups; i++) { 223 desc_group = pctrl->desc->groups + i; 224 desc_function = desc_group->functions; 225 226 while (desc_function->name) { 227 berlin_pinctrl_add_function(pctrl, desc_function->name); 228 desc_function++; 229 } 230 } 231 232 pctrl->functions = krealloc(pctrl->functions, 233 pctrl->nfunctions * sizeof(*pctrl->functions), 234 GFP_KERNEL); 235 if (!pctrl->functions) 236 return -ENOMEM; 237 238 /* map functions to theirs groups */ 239 for (i = 0; i < pctrl->desc->ngroups; i++) { 240 desc_group = pctrl->desc->groups + i; 241 desc_function = desc_group->functions; 242 243 while (desc_function->name) { 244 struct pinfunction *function = pctrl->functions; 245 const char **groups; 246 bool found = false; 247 248 while (function->name) { 249 if (!strcmp(desc_function->name, function->name)) { 250 found = true; 251 break; 252 } 253 function++; 254 } 255 256 if (!found) { 257 kfree(pctrl->functions); 258 return -EINVAL; 259 } 260 > 261 groups = devm_krealloc_array(&pdev->dev, function->groups, 262 function->ngroups, 263 sizeof(*function->groups), 264 GFP_KERNEL); 265 if (!groups) { 266 kfree(pctrl->functions); 267 return -ENOMEM; 268 } 269 function->groups = groups; 270 while (*groups) 271 groups++; 272 273 *groups = desc_group->name; 274 275 desc_function++; 276 } 277 } 278 279 return 0; 280 } 281
diff --git a/drivers/pinctrl/berlin/berlin.c b/drivers/pinctrl/berlin/berlin.c index 9550cc8095c2..3c0873a00fd3 100644 --- a/drivers/pinctrl/berlin/berlin.c +++ b/drivers/pinctrl/berlin/berlin.c @@ -27,7 +27,7 @@ struct berlin_pinctrl { struct regmap *regmap; struct device *dev; const struct berlin_pinctrl_desc *desc; - struct berlin_pinctrl_function *functions; + struct pinfunction *functions; unsigned nfunctions; struct pinctrl_dev *pctrl_dev; }; @@ -120,12 +120,12 @@ static const char *berlin_pinmux_get_function_name(struct pinctrl_dev *pctrl_dev static int berlin_pinmux_get_function_groups(struct pinctrl_dev *pctrl_dev, unsigned function, const char * const **groups, - unsigned * const num_groups) + unsigned * const ngroups) { struct berlin_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctrl_dev); *groups = pctrl->functions[function].groups; - *num_groups = pctrl->functions[function].ngroups; + *ngroups = pctrl->functions[function].ngroups; return 0; } @@ -153,7 +153,7 @@ static int berlin_pinmux_set(struct pinctrl_dev *pctrl_dev, { struct berlin_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctrl_dev); const struct berlin_desc_group *group_desc = pctrl->desc->groups + group; - struct berlin_pinctrl_function *func = pctrl->functions + function; + struct pinfunction *func = pctrl->functions + function; struct berlin_desc_function *function_desc = berlin_pinctrl_find_function_by_name(pctrl, group_desc, func->name); @@ -180,7 +180,7 @@ static const struct pinmux_ops berlin_pinmux_ops = { static int berlin_pinctrl_add_function(struct berlin_pinctrl *pctrl, const char *name) { - struct berlin_pinctrl_function *function = pctrl->functions; + struct pinfunction *function = pctrl->functions; while (function->name) { if (!strcmp(function->name, name)) { @@ -214,8 +214,7 @@ static int berlin_pinctrl_build_state(struct platform_device *pdev) } /* we will reallocate later */ - pctrl->functions = kcalloc(max_functions, - sizeof(*pctrl->functions), GFP_KERNEL); + pctrl->functions = kcalloc(max_functions, sizeof(*pctrl->functions), GFP_KERNEL); if (!pctrl->functions) return -ENOMEM; @@ -242,8 +241,7 @@ static int berlin_pinctrl_build_state(struct platform_device *pdev) desc_function = desc_group->functions; while (desc_function->name) { - struct berlin_pinctrl_function - *function = pctrl->functions; + struct pinfunction *function = pctrl->functions; const char **groups; bool found = false; @@ -260,20 +258,15 @@ static int berlin_pinctrl_build_state(struct platform_device *pdev) return -EINVAL; } - if (!function->groups) { - function->groups = - devm_kcalloc(&pdev->dev, + groups = devm_krealloc_array(&pdev->dev, function->groups, function->ngroups, - sizeof(char *), + sizeof(*function->groups), GFP_KERNEL); - - if (!function->groups) { - kfree(pctrl->functions); - return -ENOMEM; - } + if (!groups) { + kfree(pctrl->functions); + return -ENOMEM; } - - groups = function->groups; + function->groups = groups; while (*groups) groups++; diff --git a/drivers/pinctrl/berlin/berlin.h b/drivers/pinctrl/berlin/berlin.h index d7787754d1ed..231aab61d415 100644 --- a/drivers/pinctrl/berlin/berlin.h +++ b/drivers/pinctrl/berlin/berlin.h @@ -28,12 +28,6 @@ struct berlin_pinctrl_desc { unsigned ngroups; }; -struct berlin_pinctrl_function { - const char *name; - const char **groups; - unsigned ngroups; -}; - #define BERLIN_PINCTRL_GROUP(_name, _offset, _width, _lsb, ...) \ { \ .name = _name, \