From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B9FB324503C; Thu, 12 Feb 2026 04:59:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770872356; cv=none; b=CPUk2gs5Rwg6g+4b01+9TL7rLGdMSTO47TkFBiJpMA9g4/XmAKwZMqyYalG4HsCLs57raQlM7foGpWNgIABlngI3a6tb+wOaQ6nk6LFHbNzEe55DEd4IHrLtuI1R22oZjgdJxFH6/Ozfu2FaDbzduiFhRCqV7hLPBe1Xht7nAbI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770872356; c=relaxed/simple; bh=UnAdBLauz4b5Df5C+3yEl1YgYjyNNMVaiRJ8Yi+kh58=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=mr8nbu9TevgVEJva/KnK9PmRPXrv9qpQb1tAREltXp0Hsf6PLuj3fZuB0vhnG/iSYisOOcSz7xvDzhHtGNNRHEM8g3pVWoAvSloeScXGpUkpd95l/pqgLLeMDnTaIxuzwkBHApf2dcumexwv5iVX+/eeq6tgGUVr8eA+rPGBa5I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=r71Kt3KM; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="r71Kt3KM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C8AD6C19424; Thu, 12 Feb 2026 04:59:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1770872356; bh=UnAdBLauz4b5Df5C+3yEl1YgYjyNNMVaiRJ8Yi+kh58=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=r71Kt3KMl5dacM2hd4zRiZPY9ASgouLClvQBczCm3QC9WC32MM0S8Hwc3BFNXel/z 8E85PQjPgucKv2aY0Qe1lRyBjf/0jHDOW4sjafOdjoEXg7L7DXqaHN5lLuYE2HNOuw nev3+RaV1XqAQg3nfOWnJwOlfn1HvyBgcZzPkTHuQvKnC8iDBLj3EHxn1gIkujcl/I t7cWKeP92BLzkj/focLbKecUoPXAlvtKipAKaDuJL2Y2IimbTH5m/RtYzQADtxEnno U9JnjcQsnDCos36AnTjNk5L5gRPD8/gk9zt4TemhW1iePMfNclRwBdZXZsj36Wn0Ce P6mVdDJufGYnw== Date: Thu, 12 Feb 2026 10:29:12 +0530 From: Vinod Koul To: Geert Uytterhoeven Cc: Ulf Hansson , Vladimir Oltean , Yoshihiro Shimoda , Neil Armstrong , Josua Mayer , Wolfram Sang , Tommaso Merciai , linux-phy@lists.infradead.org, linux-mmc@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH next] phy: renesas: rcar-gen3-usb2: Drop local devm_mux_state_get_optional() Message-ID: References: <67c8c4f9bf9f09fd0c13daedef27b82ff389ddfb.1770720452.git.geert+renesas@glider.be> Precedence: bulk X-Mailing-List: linux-next@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: Hi Geert, On 11-02-26, 17:30, Geert Uytterhoeven wrote: > Hi Vinod, > > On Wed, 11 Feb 2026 at 17:17, Vinod Koul wrote: > > On 10-02-26, 14:34, Ulf Hansson wrote: > > > On Tue, 10 Feb 2026 at 11:53, Geert Uytterhoeven > > > wrote: > > > > Now the mux core provides devm_mux_state_get_optional(): > > > > > > > > drivers/phy/renesas/phy-rcar-gen3-usb2.c:944:1: error: static declaration of ‘devm_mux_state_get_optional’ follows non-static > > > > declaration > > > > 944 | devm_mux_state_get_optional(struct device *dev, const char *mux_name) > > > > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ > > > > In file included from drivers/phy/renesas/phy-rcar-gen3-usb2.c:20: > > > > include/linux/mux/consumer.h:64:19: note: previous declaration of ‘devm_mux_state_get_optional’ with type ‘struct mux_state *(struct device *, const char *)’ > > > > 64 | struct mux_state *devm_mux_state_get_optional(struct device *dev, const char *mux_name); > > > > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ > > > > > > > > Fix this by dropping the temporary local wrapper. > > > > > > > > Fixes: ad314348ceb4fe1f ("mux: Add helper functions for getting optional and selected mux-state") > > > > Fixes: 8bb92fd7a0407792 ("phy: renesas: rcar-gen3-usb2: Use mux-state for phyrst management") > > > > Signed-off-by: Geert Uytterhoeven > > > > > > Thanks Geert for helping out! > > > > > > > --- > > > > - ad314348ceb4fe1f is in mmc/next, and a PR has already been sent > > > > https://lore.kernel.org/20260209133441.556464-1-ulf.hansson@linaro.org > > > > - 8bb92fd7a0407792 is in phy/next > > > > > > Vinod, do you want to pick up the $subject patch as a fix for 7.0-rc1 > > > or do you prefer me to handle it? > > > > Should I drop the 8bb92fd7a0407792 and it makes things easier for > > everyone and then we can pick fixed commit for 7.1 cycle.. > > > > Does that work for everyone. I was about to send PR, will hold off for a > > bit. > > Alternatively, you can mention the semantic conflict in your PR to Linus, > and ask him to fold my patch into the merge commit. Hmmm, that is also a good option but might leave Linus a bit grumpy so bit reluctant. Dropping and getting right implementation would be better. I think it was a mistake to pick or this all could have gone thru mux tree. Thanks -- ~Vinod