From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1C8B2C83F26 for ; Wed, 30 Jul 2025 15:35:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A98036B0089; Wed, 30 Jul 2025 11:35:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A6FF16B008C; Wed, 30 Jul 2025 11:35:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 986046B0092; Wed, 30 Jul 2025 11:35:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 8578E6B0089 for ; Wed, 30 Jul 2025 11:35:08 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 2FD5F114106 for ; Wed, 30 Jul 2025 15:35:08 +0000 (UTC) X-FDA: 83721329496.06.66DDB81 Received: from aposti.net (aposti.net [185.119.170.32]) by imf07.hostedemail.com (Postfix) with ESMTP id 4A08840007 for ; Wed, 30 Jul 2025 15:35:06 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=crapouillou.net header.s=mail header.b=4Q2yQiV6; dmarc=pass (policy=none) header.from=crapouillou.net; spf=pass (imf07.hostedemail.com: domain of paul@crapouillou.net designates 185.119.170.32 as permitted sender) smtp.mailfrom=paul@crapouillou.net ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1753889706; a=rsa-sha256; cv=none; b=y7k+rslFSRIEMYoCBEdc2198ZgricwbtSWOJO89wPFqS2KFUmwqvO8qHk+Kn3sNb5CRVGo +HTRwY2tomH0Cpj+u5GjsS7hKulSHJZqIxWTTDNocyTGIPGDOGJAxfHewqXp89dEdk37iN 3ptUDX88CmlhiLJBhlOUglZ6laX9lKk= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=crapouillou.net header.s=mail header.b=4Q2yQiV6; dmarc=pass (policy=none) header.from=crapouillou.net; spf=pass (imf07.hostedemail.com: domain of paul@crapouillou.net designates 185.119.170.32 as permitted sender) smtp.mailfrom=paul@crapouillou.net ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1753889706; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=+A2EYSYGXUTyecspfSq8haW0lJ3/BUIyY65G7kmYoMc=; b=1f/2lYkOTPJXJTqP/PBkqRtO/OXO47VJU+GOjzfpqLHzVi13qCj32fPxf4jG4XV4t+AGOz yJ5qL2z40gkrJrR52VGoXA0UWJACU015ab6diFltcVSEIb8vrlfpqhjZXUgRcpjtzlaNBy Vm5/cz+yQorQuQo6iLbFl5Lsvx0jy+M= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1753889703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=+A2EYSYGXUTyecspfSq8haW0lJ3/BUIyY65G7kmYoMc=; b=4Q2yQiV6QHlq/IFSgYHLB3uaNuohZ1SaylFQ8oAG0sCUUlhcq5Kz8CnQPtqyzI2P3BVguF AwOc7GkRyD8NrDR1MH6ywUtipiaON+KQPQBzJEvFa+BEZbKqWOpQshOpdwIQiwhWXrEyUb J5YKvkmDnse9kc7aJ8EO1ZJq+1Y9bEc= Message-ID: Subject: Re: [PATCH v3 02/15] pinctrl: ingenic: use struct pinfunction instead of struct function_desc From: Paul Cercueil To: Bartosz Golaszewski , Linus Walleij , Bjorn Andersson , Konrad Dybcio , Alexey Klimov , Lorenzo Bianconi , Sean Wang , Matthias Brugger , AngeloGioacchino Del Regno , Kees Cook , Andy Shevchenko , Andrew Morton , David Hildenbrand , Lorenzo Stoakes , "Liam R. Howlett" , Vlastimil Babka , Mike Rapoport , Suren Baghdasaryan , Michal Hocko , Dong Aisheng , Fabio Estevam , Shawn Guo , Jacky Bai , Pengutronix Kernel Team , NXP S32 Linux Team , Sascha Hauer , Tony Lindgren , Haojian Zhuang , Geert Uytterhoeven Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linux-hardening@vger.kernel.org, linux-mm@kvack.org, imx@lists.linux.dev, linux-omap@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Bartosz Golaszewski Date: Wed, 30 Jul 2025 17:35:00 +0200 In-Reply-To: <20250724-pinctrl-gpio-pinfuncs-v3-2-af4db9302de4@linaro.org> References: <20250724-pinctrl-gpio-pinfuncs-v3-0-af4db9302de4@linaro.org> <20250724-pinctrl-gpio-pinfuncs-v3-2-af4db9302de4@linaro.org> Autocrypt: addr=paul@crapouillou.net; prefer-encrypt=mutual; keydata=mQENBF0KhcEBCADkfmrzdTOp/gFOMQX0QwKE2WgeCJiHPWkpEuPH81/HB2dpjPZNW03ZM LQfECbbaEkdbN4YnPfXgcc1uBe5mwOAPV1MBlaZcEt4M67iYQwSNrP7maPS3IaQJ18ES8JJ5Uf5Uz FZaUawgH+oipYGW+v31cX6L3k+dGsPRM0Pyo0sQt52fsopNPZ9iag0iY7dGNuKenaEqkYNjwEgTtN z8dt6s3hMpHIKZFL3OhAGi88wF/21isv0zkF4J0wlf9gYUTEEY3Eulx80PTVqGIcHZzfavlWIdzhe +rxHTDGVwseR2Y1WjgFGQ2F+vXetAB8NEeygXee+i9nY5qt9c07m8mzjABEBAAG0JFBhdWwgQ2VyY 3VlaWwgPHBhdWxAY3JhcG91aWxsb3UubmV0PokBTgQTAQoAOBYhBNdHYd8OeCBwpMuVxnPua9InSr 1BBQJdCoXBAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEHPua9InSr1BgvIH/0kLyrI3V0f 33a6D3BJwc1grbygPVYGuC5l5eMnAI+rDmLR19E2yvibRpgUc87NmPEQPpbbtAZt8On/2WZoE5OIP dlId/AHNpdgAtGXo0ZX4LGeVPjxjdkbrKVHxbcdcnY+zzaFglpbVSvp76pxqgVg8PgxkAAeeJV+ET 4t0823Gz2HzCL/6JZhvKAEtHVulOWoBh368SYdolp1TSfORWmHzvQiCCCA+j0cMkYVGzIQzEQhX7U rf9N/nhU5/SGLFEi9DcBfXoGzhyQyLXflhJtKm3XGB1K/pPulbKaPcKAl6rIDWPuFpHkSbmZ9r4KF lBwgAhlGy6nqP7O3u7q23hRU= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 4A08840007 X-Stat-Signature: 75h7pd1ct59er148r36u5egrmxg4pggg X-HE-Tag: 1753889706-75801 X-HE-Meta: U2FsdGVkX19GL5Nntb08p6NYZmYRG1p4xSvknx67ja5YG73Qk6LzRps95+NNl5Hi3jdpRB2KQm6AecjwuVXwCDDawIQpfXMFFcqPvdZD1HDvyrNmwGMM74Fj7SYnic0Zn/zYj4kQH1uzQz+MzKT0XVxee3lsPCsuEtiLF08EjMn6HO5NmBdff6FBbK7jkA1k+2aU/s0mOT6BH5toGYTYKisE0WK3FRNoi+0ZArhF633zFgloFdno0LOQozHX1NTS9UywBS9UaVNfTaPIyKcwIVZYmeB0Y0MXbCtTYy4sTLyWV2A60GpPaVSdl7thKOGQkOwFfqFg1TGUoMHJH+p/8mFkgv734H4lk24sCUKyr+6Sp+DxPgY7i4gyX8eJuy+4kHC/cMr3j0myG0iTPNZkMSFTmQRRd6z4TL61tJRgz0KcF9AVhISHN3fwhXofO12fdnnFISpF4koMk+KEOvldWpxl4xf9ydQswD+qhsKcawp5IV91hY881l7p9MnShAleOwG7AkClL5iFtyNSxKpt8o9h3b1AxZRI3ujv4wcek8+qP9U4xRk4iUNs9u5gbjr6czz1ZOQcuauI+km2XMb4hn3+T2tZXapUBdWZOMyO9oOWu2gvvcHEv09GlGTuoQQwRsib4dS+gchNly8u9K4H7yiOG1q1jNXH2ND8SyfODFK0MXH6/M024kOybxFG9M4Izmsa2IViHXa/S08oIp8KSzPxBrr9fwlT9+728KEJwXfqBDvQERWIDlfxxix6PXwDChE9J7u65MRvTzv9ZaKKUPvY+lTqNTPTICtdRXkkeWR6c4XC2zZHugjyoKsXkkzQRRSLNnpCEnDwrxLeBoSGCZej1UQRizMIX2LqPI7hk04PwVHE5aGCJNiZM8UwshmgnN152qc6OFIZVqEwya2BSFbLYxayIifbIs09J4GRdwss9PsZ/uk6bO2/yWm37mz4STI6lhsA2F8ZVdDYKck vf0Ar1NQ OqfmJWX3Rq7HfyoemnP3hf3nQ9pwEymnGTDLElt2lVHpBzqXDt9mUMpANF69LHbDUyekwd8sukzBeNIA172fJomicu2w5Yz7hfFzdxn+tNAOfCI21kTF3rQOXoULfrBSoKrNEni40N0vPP/Jt+FUKLYzWjqIfUAUzbxpIx734ay0lvxeptzRtzLb/My9/ilbHfqdvFB0o4o35H6+lHqOP5MTnUXPvK/q6/vgrFFxhsJ8RXvieIJ953uBqLZwuVJi/egvEsAfxFPngz2ZV/yz/qK4jtwJ6AcjrsRbGHFrAr+2wOfdTNdmgb3CpEM/zSmuU0IYSzTESHIyPRXhAkT8CcqrPsMcNNEBgvGQvkgqBXOtHqpkxoTvvJxO2SLwKXRfSJsM66t4/XWWOgIyyT+5M/YmDoZZz7Tswnhk8 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Hi Bartosz, Le jeudi 24 juillet 2025 =C3=A0 11:24 +0200, Bartosz Golaszewski a =C3=A9cr= it=C2=A0: > From: Bartosz Golaszewski >=20 > struct function_desc is a wrapper around struct pinfunction with an > additional void *data pointer. This driver doesn't use the data > pointer. > We're also working towards reducing the usage of struct function_desc > in > pinctrl drivers - they should only be created by pinmux core and > accessed by drivers using pinmux_generic_get_function(). Replace the > struct function_desc objects in this driver with smaller struct > pinfunction instances. >=20 > Signed-off-by: Bartosz Golaszewski Acked-by: Paul Cercueil Cheers, -Paul > --- > =C2=A0drivers/pinctrl/pinctrl-ingenic.c | 45 +++++++++++++++++-----------= - > ---------- > =C2=A01 file changed, 20 insertions(+), 25 deletions(-) >=20 > diff --git a/drivers/pinctrl/pinctrl-ingenic.c > b/drivers/pinctrl/pinctrl-ingenic.c > index > 79119cf20efcf8cc701647d9ff979c2b71bf7589..0ee8554c5446c4167c9b0e6b939 > 7a2507ca57419 100644 > --- a/drivers/pinctrl/pinctrl-ingenic.c > +++ b/drivers/pinctrl/pinctrl-ingenic.c > @@ -96,11 +96,8 @@ > =C2=A0 .data =3D (void > *)func, \ > =C2=A0 } > =C2=A0 > -#define INGENIC_PIN_FUNCTION(_name_, > id) \ > - > { \ > - .func =3D PINCTRL_PINFUNCTION(_name_, id##_groups, > ARRAY_SIZE(id##_groups)), \ > - .data =3D > NULL, \ > - } > +#define INGENIC_PIN_FUNCTION(_name_, > id) \ > + PINCTRL_PINFUNCTION(_name_, id##_groups, > ARRAY_SIZE(id##_groups)) > =C2=A0 > =C2=A0enum jz_version { > =C2=A0 ID_JZ4730, > @@ -128,7 +125,7 @@ struct ingenic_chip_info { > =C2=A0 const struct group_desc *groups; > =C2=A0 unsigned int num_groups; > =C2=A0 > - const struct function_desc *functions; > + const struct pinfunction *functions; > =C2=A0 unsigned int num_functions; > =C2=A0 > =C2=A0 const u32 *pull_ups, *pull_downs; > @@ -263,7 +260,7 @@ static const char *jz4730_pwm1_groups[] =3D { > "pwm1", }; > =C2=A0static const char *jz4730_mii_groups[] =3D { "mii", }; > =C2=A0static const char *jz4730_i2s_groups[] =3D { "i2s-data", "i2s-maste= r", > "i2s-slave", }; > =C2=A0 > -static const struct function_desc jz4730_functions[] =3D { > +static const struct pinfunction jz4730_functions[] =3D { > =C2=A0 INGENIC_PIN_FUNCTION("mmc", jz4730_mmc), > =C2=A0 INGENIC_PIN_FUNCTION("uart0", jz4730_uart0), > =C2=A0 INGENIC_PIN_FUNCTION("uart1", jz4730_uart1), > @@ -370,7 +367,7 @@ static const char *jz4740_pwm5_groups[] =3D { > "pwm5", }; > =C2=A0static const char *jz4740_pwm6_groups[] =3D { "pwm6", }; > =C2=A0static const char *jz4740_pwm7_groups[] =3D { "pwm7", }; > =C2=A0 > -static const struct function_desc jz4740_functions[] =3D { > +static const struct pinfunction jz4740_functions[] =3D { > =C2=A0 INGENIC_PIN_FUNCTION("mmc", jz4740_mmc), > =C2=A0 INGENIC_PIN_FUNCTION("uart0", jz4740_uart0), > =C2=A0 INGENIC_PIN_FUNCTION("uart1", jz4740_uart1), > @@ -474,7 +471,7 @@ static const char *jz4725b_pwm3_groups[] =3D { > "pwm3", }; > =C2=A0static const char *jz4725b_pwm4_groups[] =3D { "pwm4", }; > =C2=A0static const char *jz4725b_pwm5_groups[] =3D { "pwm5", }; > =C2=A0 > -static const struct function_desc jz4725b_functions[] =3D { > +static const struct pinfunction jz4725b_functions[] =3D { > =C2=A0 INGENIC_PIN_FUNCTION("mmc0", jz4725b_mmc0), > =C2=A0 INGENIC_PIN_FUNCTION("mmc1", jz4725b_mmc1), > =C2=A0 INGENIC_PIN_FUNCTION("uart", jz4725b_uart), > @@ -606,7 +603,7 @@ static const char *jz4750_pwm3_groups[] =3D { > "pwm3", }; > =C2=A0static const char *jz4750_pwm4_groups[] =3D { "pwm4", }; > =C2=A0static const char *jz4750_pwm5_groups[] =3D { "pwm5", }; > =C2=A0 > -static const struct function_desc jz4750_functions[] =3D { > +static const struct pinfunction jz4750_functions[] =3D { > =C2=A0 INGENIC_PIN_FUNCTION("uart0", jz4750_uart0), > =C2=A0 INGENIC_PIN_FUNCTION("uart1", jz4750_uart1), > =C2=A0 INGENIC_PIN_FUNCTION("uart2", jz4750_uart2), > @@ -771,7 +768,7 @@ static const char *jz4755_pwm3_groups[] =3D { > "pwm3", }; > =C2=A0static const char *jz4755_pwm4_groups[] =3D { "pwm4", }; > =C2=A0static const char *jz4755_pwm5_groups[] =3D { "pwm5", }; > =C2=A0 > -static const struct function_desc jz4755_functions[] =3D { > +static const struct pinfunction jz4755_functions[] =3D { > =C2=A0 INGENIC_PIN_FUNCTION("uart0", jz4755_uart0), > =C2=A0 INGENIC_PIN_FUNCTION("uart1", jz4755_uart1), > =C2=A0 INGENIC_PIN_FUNCTION("uart2", jz4755_uart2), > @@ -1106,7 +1103,7 @@ static const char *jz4760_pwm6_groups[] =3D { > "pwm6", }; > =C2=A0static const char *jz4760_pwm7_groups[] =3D { "pwm7", }; > =C2=A0static const char *jz4760_otg_groups[] =3D { "otg-vbus", }; > =C2=A0 > -static const struct function_desc jz4760_functions[] =3D { > +static const struct pinfunction jz4760_functions[] =3D { > =C2=A0 INGENIC_PIN_FUNCTION("uart0", jz4760_uart0), > =C2=A0 INGENIC_PIN_FUNCTION("uart1", jz4760_uart1), > =C2=A0 INGENIC_PIN_FUNCTION("uart2", jz4760_uart2), > @@ -1444,7 +1441,7 @@ static const char *jz4770_pwm6_groups[] =3D { > "pwm6", }; > =C2=A0static const char *jz4770_pwm7_groups[] =3D { "pwm7", }; > =C2=A0static const char *jz4770_mac_groups[] =3D { "mac-rmii", "mac-mii",= }; > =C2=A0 > -static const struct function_desc jz4770_functions[] =3D { > +static const struct pinfunction jz4770_functions[] =3D { > =C2=A0 INGENIC_PIN_FUNCTION("uart0", jz4770_uart0), > =C2=A0 INGENIC_PIN_FUNCTION("uart1", jz4770_uart1), > =C2=A0 INGENIC_PIN_FUNCTION("uart2", jz4770_uart2), > @@ -1723,7 +1720,7 @@ static const char *jz4775_mac_groups[] =3D { > =C2=A0}; > =C2=A0static const char *jz4775_otg_groups[] =3D { "otg-vbus", }; > =C2=A0 > -static const struct function_desc jz4775_functions[] =3D { > +static const struct pinfunction jz4775_functions[] =3D { > =C2=A0 INGENIC_PIN_FUNCTION("uart0", jz4775_uart0), > =C2=A0 INGENIC_PIN_FUNCTION("uart1", jz4775_uart1), > =C2=A0 INGENIC_PIN_FUNCTION("uart2", jz4775_uart2), > @@ -1976,7 +1973,7 @@ static const char *jz4780_dmic_groups[] =3D { > "dmic", }; > =C2=A0static const char *jz4780_cim_groups[] =3D { "cim-data", }; > =C2=A0static const char *jz4780_hdmi_ddc_groups[] =3D { "hdmi-ddc", }; > =C2=A0 > -static const struct function_desc jz4780_functions[] =3D { > +static const struct pinfunction jz4780_functions[] =3D { > =C2=A0 INGENIC_PIN_FUNCTION("uart0", jz4770_uart0), > =C2=A0 INGENIC_PIN_FUNCTION("uart1", jz4770_uart1), > =C2=A0 INGENIC_PIN_FUNCTION("uart2", jz4780_uart2), > @@ -2211,7 +2208,7 @@ static const char *x1000_pwm3_groups[] =3D { > "pwm3", }; > =C2=A0static const char *x1000_pwm4_groups[] =3D { "pwm4", }; > =C2=A0static const char *x1000_mac_groups[] =3D { "mac", }; > =C2=A0 > -static const struct function_desc x1000_functions[] =3D { > +static const struct pinfunction x1000_functions[] =3D { > =C2=A0 INGENIC_PIN_FUNCTION("uart0", x1000_uart0), > =C2=A0 INGENIC_PIN_FUNCTION("uart1", x1000_uart1), > =C2=A0 INGENIC_PIN_FUNCTION("uart2", x1000_uart2), > @@ -2341,7 +2338,7 @@ static const char *x1500_pwm2_groups[] =3D { > "pwm2", }; > =C2=A0static const char *x1500_pwm3_groups[] =3D { "pwm3", }; > =C2=A0static const char *x1500_pwm4_groups[] =3D { "pwm4", }; > =C2=A0 > -static const struct function_desc x1500_functions[] =3D { > +static const struct pinfunction x1500_functions[] =3D { > =C2=A0 INGENIC_PIN_FUNCTION("uart0", x1500_uart0), > =C2=A0 INGENIC_PIN_FUNCTION("uart1", x1500_uart1), > =C2=A0 INGENIC_PIN_FUNCTION("uart2", x1500_uart2), > @@ -2562,7 +2559,7 @@ static const char * const x1600_pwm7_groups[] =3D > { "pwm7-b10", "pwm7-b21", }; > =C2=A0 > =C2=A0static const char * const x1600_mac_groups[] =3D { "mac", }; > =C2=A0 > -static const struct function_desc x1600_functions[] =3D { > +static const struct pinfunction x1600_functions[] =3D { > =C2=A0 INGENIC_PIN_FUNCTION("uart0", x1600_uart0), > =C2=A0 INGENIC_PIN_FUNCTION("uart1", x1600_uart1), > =C2=A0 INGENIC_PIN_FUNCTION("uart2", x1600_uart2), > @@ -2779,7 +2776,7 @@ static const char *x1830_pwm6_groups[] =3D { > "pwm6-c-17", "pwm6-c-27", }; > =C2=A0static const char *x1830_pwm7_groups[] =3D { "pwm7-c-18", "pwm7-c-2= 8", > }; > =C2=A0static const char *x1830_mac_groups[] =3D { "mac", }; > =C2=A0 > -static const struct function_desc x1830_functions[] =3D { > +static const struct pinfunction x1830_functions[] =3D { > =C2=A0 INGENIC_PIN_FUNCTION("uart0", x1830_uart0), > =C2=A0 INGENIC_PIN_FUNCTION("uart1", x1830_uart1), > =C2=A0 INGENIC_PIN_FUNCTION("sfc", x1830_sfc), > @@ -3225,7 +3222,7 @@ static const char *x2000_mac0_groups[] =3D { > "mac0-rmii", "mac0-rgmii", }; > =C2=A0static const char *x2000_mac1_groups[] =3D { "mac1-rmii", "mac1- > rgmii", }; > =C2=A0static const char *x2000_otg_groups[] =3D { "otg-vbus", }; > =C2=A0 > -static const struct function_desc x2000_functions[] =3D { > +static const struct pinfunction x2000_functions[] =3D { > =C2=A0 INGENIC_PIN_FUNCTION("uart0", x2000_uart0), > =C2=A0 INGENIC_PIN_FUNCTION("uart1", x2000_uart1), > =C2=A0 INGENIC_PIN_FUNCTION("uart2", x2000_uart2), > @@ -3449,7 +3446,7 @@ static const struct group_desc x2100_groups[] =3D > { > =C2=A0 > =C2=A0static const char *x2100_mac_groups[] =3D { "mac", }; > =C2=A0 > -static const struct function_desc x2100_functions[] =3D { > +static const struct pinfunction x2100_functions[] =3D { > =C2=A0 INGENIC_PIN_FUNCTION("uart0", x2000_uart0), > =C2=A0 INGENIC_PIN_FUNCTION("uart1", x2000_uart1), > =C2=A0 INGENIC_PIN_FUNCTION("uart2", x2000_uart2), > @@ -4571,11 +4568,9 @@ static int __init ingenic_pinctrl_probe(struct > platform_device *pdev) > =C2=A0 } > =C2=A0 > =C2=A0 for (i =3D 0; i < chip_info->num_functions; i++) { > - const struct function_desc *function =3D &chip_info- > >functions[i]; > - const struct pinfunction *func =3D &function->func; > + const struct pinfunction *func =3D &chip_info- > >functions[i]; > =C2=A0 > - err =3D pinmux_generic_add_pinfunction(jzpc->pctl, > func, > - =C2=A0=C2=A0=C2=A0=C2=A0 function- > >data); > + err =3D pinmux_generic_add_pinfunction(jzpc->pctl, > func, NULL); > =C2=A0 if (err < 0) { > =C2=A0 dev_err(dev, "Failed to register function > %s\n", func->name); > =C2=A0 return err;