Message-ID: <08cf07a5-5aaf-586c-5745-c41df7091b54@axentia.se>
Date:   Fri, 7 Jan 2022 08:10:34 +0100
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101
 Thunderbird/91.4.1
Subject: Re: [PATCH 4/6] mux: add missing mux_state_get
Content-Language: en-US
To:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc:     Aswath Govindraju <a-govindraju@ti.com>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
References: <94ab71e1-2e68-def2-95b8-33162172f65c@axentia.se>
 <90c40462-9672-949a-14cd-e13e440fe177@axentia.se>
 <YdLvGge5SbuhAi3N@kroah.com>
 <08a48424-a8e6-f08a-63d3-b00aa5cd33f2@axentia.se>
 <Ydb/lQMPxw3/IDIF@kroah.com>
From:   Peter Rosin <peda@axentia.se>
Organization: Axentia Technologies AB
In-Reply-To: <Ydb/lQMPxw3/IDIF@kroah.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NnRzdStkbm93SmJoR2hpWVJYSGJtc2ZwR3dZNnhCaHFNeThMMTFnZC9YVHBH?=
 =?utf-8?B?SHN0Y3BLMmhFMU9VcU9GQWxSQ1pwYjZGbjJpTEZDeFVzWWE5K0duamhOUDBF?=
 =?utf-8?B?MTZpcjBPc0ZNNVV4c3U1T3VWM1Z1WmQ5OFRpRG00N3FvZEZPMEtlc2pHUjJH?=
 =?utf-8?B?WnF5VUpTNk05VkxoWWxYaEd0NWpvU0Mzb2J4Zmw0WVlqeS9rZHZkdTUyc0Fv?=
 =?utf-8?B?ald0djVjMVZiK3c1eEVERzd1QitSOHFqZzhHS2RQR2VIa3dndVJYOGlXdkIw?=
 =?utf-8?B?WlgyYkUyeGFVSEhqUzF1YklkSitnREhSc2JCSlNvSGkxaXBXdFNhSnNwMDBt?=
 =?utf-8?B?Nzg3T2FraXZybEFqTmhNQ3U5Ty9RL0cyTTVzT0pldDlVUTVzRVFhNXpPdUEw?=
 =?utf-8?B?OTJFeTNFWUlPdTZYWDVpcjJibWVpMXJ6Vmd4WXdRNE9hK2hDZkhZWFVCeklZ?=
 =?utf-8?B?ekhnbUd2VlZtMmtBaWQxRXhLL2d5L1ViMTdWTkRmbmF6eisyS0NMT0RLY1ov?=
 =?utf-8?B?N2xWUDRaMVlrbE5XNVRLWWtmelE5VnZML0VxbUdXOWJOM2tBQ3FYS1FpUEg1?=
 =?utf-8?B?bmdTZzVFSnVmSUlCNCsyVXJ2dkJSbGpZQVZiUlRlM1pZT1h6Sis1ajZuT0o4?=
 =?utf-8?B?UUtleG1OMW1hK1d2VzVsQVprcDdvNlB0ZENjVEt4RjZhMGhOMTZtUzdBZnN2?=
 =?utf-8?B?TW1wNUZPSklIOTlXYUk4U0Q3a1pHTzlIMVV5NGFWeEZyUXcvb0l1SEdLMWVu?=
 =?utf-8?B?aENVYjZQaEM0WEpyMlp0MnlMVnN3dUxRRFZxU0grRE1HL1dWb2FDamRGN0Fm?=
 =?utf-8?B?VXdENTc4bkN1d215Y1ZPbGZGSFZpU0c1L3kzVnZYVjU2QWtENTIvMDVFTFdV?=
 =?utf-8?B?SXVGYVNHRVU5MzRuZUVFODZXNGgySnVNMkFUYzMxakhLNG1KRkhodjkzNG1W?=
 =?utf-8?B?UEtKbEM0TXFzckRYTEhHNWNhVmYrVVRxNFYwam5qWmNjU1VPS0c4TFFtcDRt?=
 =?utf-8?B?N0I2NnRGM0xHRXdQbXk5cWlHVUVUbkJsK25MVXk5Z002Z2ZBVGhqbkFOblRi?=
 =?utf-8?B?N21GZ2w3T3ZZbGU1OE1oWEJtR2N0MGg4Q1NMRVQvVXZlR2pkbGVtTE1HM3pE?=
 =?utf-8?B?amU2UE1lZUpzQmZ2cEE4NHJVKzFmdWo5YjhrL0NSKzlLVDl6VFZIRk5vTG5r?=
 =?utf-8?B?bldYRHg3OFdOblJ6MVFyQ3VnMkE4VWNxTitaV2dZWG5BWTNSOGdzQ09Zek5s?=
 =?utf-8?B?N1V0TytGS2ozWmVPcTRvUW5KY1pmWm1wN0NUMTRFUk9COWp0WU5RZmtvdUh3?=
 =?utf-8?B?WVJtYzhva2x4QmFFcEJhekg4OWwwYzVCWWRTL1BKV1l2QUtkQTRUSXZaQ1Vy?=
 =?utf-8?B?LzkzS2Ixd3NJZHZTMDB4V1I1UFhaa1RZRlZtbEJ2WTZuWmZ2QTdleUVPU3ds?=
 =?utf-8?B?b2NEMVNLWVpTblQwbDZkb2gxWnFlWW1aeE4zSUdLdkkvMzdsOFpKV2MwWDdU?=
 =?utf-8?B?ZzFwMVRnaGxUVkRCZG95ZmNyVDBKbGZPVisva2RLTTBRc2lhbTlBdG1VeXIz?=
 =?utf-8?B?aHZKRHRVV2RMK0pkREdwTnFLdWkzUjlVV2NWalFoVmF0cWFsVzI3ZGRMMkhi?=
 =?utf-8?B?N3RBazZsa1RSWjliSG9DekpidzhtZWZHeWREaVZpUFNUZzhGeHBRMzloRjRp?=
 =?utf-8?B?c2dEUFNKMXQxOFFEUzFxTnhlRThNMUpVODhaMTd6enNycEhZMXpRWGRJTldG?=
 =?utf-8?B?cW1zSTBjbTNFaHFUd3I5MzVDdUhxMVQzaXVwQVp1ZUdXTmIraFNUb1lkUU9t?=
 =?utf-8?B?alFpUEdhNmlIZGxjdXY2ZXpVWFJIS1paa016Qk0xdnQvU0JTRnloUG5POUtr?=
 =?utf-8?B?U3VSVStvK1grTWtaQ0xKaVNHdUtjcEFpaDhtbnBOeG1kTkNEZFh2Q0pjM2Fr?=
 =?utf-8?B?ZDNDRzhYa2E4TjBqdDhUc1VVSk1QTXlWaFQwUkhXRG5rOXAraHBjbEgzbmU5?=
 =?utf-8?B?Tlk5UmRGOFJNTSt6NVZteTN0aUp2aEJFTG90TGVCSlFqRk9OM04xTWV2b2Ux?=
 =?utf-8?B?dXJxVWsrN29sRHZhbnZqaTJCUkxFOWlaLzR1NnBzY3NoTDVXMDZSMWJENE9T?=
 =?utf-8?Q?LF48=3D?=
X-OriginatorOrg: axentia.se
X-MS-Exchange-CrossTenant-Network-Message-Id: baab41fa-6148-4f6d-cce3-08d9d1acce31
X-MS-Exchange-CrossTenant-AuthSource: DB8PR02MB5482.eurprd02.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jan 2022 07:10:37.5617
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4ee68585-03e1-4785-942a-df9c1871a234
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Kp2TqDZlTC1NtHHKElKbBnh+udNfwIUzjCDdOGTmjG+vdx9GmTrB1kdSkbP+q6QE
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR02MB3929
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi!

On 2022-01-06 15:41, Greg Kroah-Hartman wrote:
> On Mon, Jan 03, 2022 at 06:26:21PM +0100, Peter Rosin wrote:
>> Hi!
>>
>> On 2022-01-03 13:42, Greg Kroah-Hartman wrote:
>>> On Sun, Jan 02, 2022 at 11:38:36PM +0100, Peter Rosin wrote:
>>>> From: Peter Rosin <peda@axentia.se>
>>>>
>>>> And implement devm_mux_state_get in terms of the new function.
>>>>
>>>> Tested-by: Aswath Govindraju <a-govindraju@ti.com>
>>>> Signed-off-by: Peter Rosin <peda@axentia.se>
>>>> ---
>>>>  drivers/mux/core.c           | 41 ++++++++++++++++++++++++++----------
>>>>  include/linux/mux/consumer.h |  1 +
>>>>  2 files changed, 31 insertions(+), 11 deletions(-)
>>>>
>>>> diff --git a/drivers/mux/core.c b/drivers/mux/core.c
>>>> index 7d38e7c0c02e..90073ce01539 100644
>>>> --- a/drivers/mux/core.c
>>>> +++ b/drivers/mux/core.c
>>>> @@ -673,6 +673,33 @@ struct mux_control *devm_mux_control_get(struct device *dev,
>>>>  }
>>>>  EXPORT_SYMBOL_GPL(devm_mux_control_get);
>>>>  
>>>> +/**
>>>> + * mux_state_get() - Get the mux-state for a device.
>>>> + * @dev: The device that needs a mux-state.
>>>> + * @mux_name: The name identifying the mux-state.
>>>> + *
>>>> + * Return: A pointer to the mux-state, or an ERR_PTR with a negative errno.
>>>> + */
>>>> +struct mux_state *mux_state_get(struct device *dev, const char *mux_name)
>>>> +{
>>>> +	struct mux_state *mstate;
>>>> +
>>>> +	mstate = kzalloc(sizeof(*mstate), GFP_KERNEL);
>>>> +	if (!mstate)
>>>> +		return ERR_PTR(-ENOMEM);
>>>> +
>>>> +	mstate->mux = mux_get(dev, mux_name, &mstate->state);
>>>
>>> will this build?  I haven't applied it but mux_get() in my tree right
>>> now is defined as:
>>> 	static inline void mux_get(struct gsm_mux *gsm)
>>
>> Yes it builds. As mentioned in the cover letter, the patches have been
>> in -next for a couple of weeks. The static definition you are pointing
>> at is from n_gsm.c (which does not seem to be #included by any other
>> file). This definition of mux_get is again static and in a .c file
>> (which is not #included by anything). Surely not a conflict?
> 
> If it's static, no, it's fine, but I don't see it in this commit either?
> 
> I'm confused now, 

Apparently :-)

The static drivers/mux/core.c:mux_get() is not in your tree because it was
introduced in patch 3/6. That patch refactored the existing mux_control_get()
into a new static helper function mux_get() with two wrappers -- the old
mux_control_get() that preserves the preexisting interface and the new
devm_mux_state_get(). mux_control_get() was always in turn wrapped by
devm_mux_control_get(), while patch 3/6 failed to add a similar double
wrapping with an intermediate mux_state_get(). Instead it wrapped mux_get()
directly.

I didn't notice that mux_state_get() was missing until after a couple of
rounds of review with Aswath, and didn't want go for another round when it
was me who had made a mistake, and instead just fixed it with a commit of
my own.

Maybe you thought "the new function" that this commit message speaks about
was mux_get() (which was new in 3/6, but no longer "new" here in 4/6), when
in fact it refers to mux_state_get()?

>                    can you resend the remaining changes and I will review
> them again?

On it.

Cheers,
Peter