From patchwork Mon Dec 19 12:42:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 635307 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 856A8C10F1B for ; Mon, 19 Dec 2022 12:42:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231931AbiLSMmd (ORCPT ); Mon, 19 Dec 2022 07:42:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50952 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231136AbiLSMma (ORCPT ); Mon, 19 Dec 2022 07:42:30 -0500 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 61EE1E018; Mon, 19 Dec 2022 04:42:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1671453749; x=1702989749; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=uUJAw123d6rgti8BHrMLRShZWWNRv/+Tg9Cbe+KiQAk=; b=bdIYZBoW35rOdHpL6GPLlTZjj4LdeLQc2VYE1fxMUJv2ldgNcWZLJsbY lfcYXylEJ4zIq1Ax6NAi17Xgp6MdNpDvY3KkZS1W7oJxdwhxha+zdNi1Y pDHMMMP6Nt7mZx4udpnf3xN3cxKg+yTMX+3YxveYnixdUnJDYptDqeGqv WXxNFaRef7Fy33MGbi7pQ0kufQlDO/aM8DCpoF3SABQBrfgIua+gSioy9 cX8IUlNG4r1B4e24vjHx2RnMKZFlQHZpp54ogi0UzSbpmrVEc3e/mQ2jd n95ZjSstRobhcfonxcWTGeVKSLEiZH6Xp0zMS5qRo0IoMo8rYod8bFmZD w==; X-IronPort-AV: E=McAfee;i="6500,9779,10565"; a="320510351" X-IronPort-AV: E=Sophos;i="5.96,255,1665471600"; d="scan'208";a="320510351" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Dec 2022 04:42:29 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10565"; a="681210363" X-IronPort-AV: E=Sophos;i="5.96,255,1665471600"; d="scan'208";a="681210363" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga008.jf.intel.com with ESMTP; 19 Dec 2022 04:42:27 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 59B1CB7; Mon, 19 Dec 2022 14:42:57 +0200 (EET) From: Andy Shevchenko To: Andy Shevchenko , Mika Westerberg , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Andy Shevchenko , Linus Walleij Subject: [PATCH v1 6/8] pinctrl: merrifield: Convert to use new memeber in struct intel_function Date: Mon, 19 Dec 2022 14:42:38 +0200 Message-Id: <20221219124240.62781-6-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221219124240.62781-1-andriy.shevchenko@linux.intel.com> References: <20221219124240.62781-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org Convert driver to use generic data type and hence a new member in the struct intel_function. No functional change intended. Signed-off-by: Andy Shevchenko --- drivers/pinctrl/intel/pinctrl-merrifield.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/pinctrl/intel/pinctrl-merrifield.c b/drivers/pinctrl/intel/pinctrl-merrifield.c index c0845bb1e9e3..365c391c97a3 100644 --- a/drivers/pinctrl/intel/pinctrl-merrifield.c +++ b/drivers/pinctrl/intel/pinctrl-merrifield.c @@ -576,7 +576,7 @@ static const char *mrfld_get_function_name(struct pinctrl_dev *pctldev, { struct mrfld_pinctrl *mp = pinctrl_dev_get_drvdata(pctldev); - return mp->functions[function].name; + return mp->functions[function].func.name; } static int mrfld_get_function_groups(struct pinctrl_dev *pctldev, @@ -586,8 +586,8 @@ static int mrfld_get_function_groups(struct pinctrl_dev *pctldev, { struct mrfld_pinctrl *mp = pinctrl_dev_get_drvdata(pctldev); - *groups = mp->functions[function].groups; - *ngroups = mp->functions[function].ngroups; + *groups = mp->functions[function].func.groups; + *ngroups = mp->functions[function].func.ngroups; return 0; }