From patchwork Fri Apr 11 03:27:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chance Yang X-Patchwork-Id: 14047484 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2137.outbound.protection.outlook.com [40.107.212.137]) (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 121B522338; Fri, 11 Apr 2025 03:27:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.212.137 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744342067; cv=fail; b=W11bT1cAuMjbXW4K0FpvJkJwax1a/bUPHiqGpuRXlPqfDjd5PJHEmbKikrpzWMtEMycqZ1KmmhLZYs6b74ll2B/wqO3g74kTqCzTKCZVHns1DhtpZSOgd3Fgfpengz380l/lC+gvYITB2xo3vgp0Tv+6LFbfYB31PJmwJZ+CIDg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744342067; c=relaxed/simple; bh=MzN1eSIVj8IAWiceALmI5C5WO6BfNntcg582znkMtDA=; h=From:Date:Subject:Content-Type:Message-Id:To:Cc:MIME-Version; b=aTxX3PdDPdNZ32jZ+s7/5nQ6R+8cxgYEkE7wellAyUjTyp4a3mvGpJuFGl0W6o/YEJmBvXZTFFpIANA08NPDXPFBTdEAcifRgZpTs4puGNxtCTXFr02EIDKfLGuZyU5ZSeYqJAshz6dGWJTEoPxDgls9fAbYcqjfcwlWx3mGCUU= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=kneron.us; spf=pass smtp.mailfrom=kneron.us; dkim=pass (1024-bit key) header.d=kneron.us header.i=@kneron.us header.b=Z3yqB9Rj; arc=fail smtp.client-ip=40.107.212.137 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=kneron.us Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kneron.us Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=kneron.us header.i=@kneron.us header.b="Z3yqB9Rj" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=CiyH16HfFgsznkZSzV6QNG9U8m4xXl0vqw1n8u8yjELaw4Jp2Rqa4S/6zSzM93OKIbCu7VfPe3wij0i9AifGdeQpzNpTVAL35axRoDKSQF03cPFwndUzWOmKlhIFJTcZ2LdyqvSvoxr2uesVd16tvf0U1oIkzBD8FHG5zvji1kKwSa3gfLYsL9jzifoJBYNWnsDImp32SpQiysh78LlCbURa4dDwUDshSOu7NMvaw1AfUs2w08hByhTmMZRbco8wTwIpO3Q3WuyAnFZJ7KXBr8jEvjo9LaaAxIfCQ9bTo4EHVzQ/Jj55jvK4NDjgbTesJHWub50wRPupDM1XG7y5Mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=RoyVwhPkWvOwqeS6n7F5XnG19gtGWbdBJ6OhY3pVIZ4=; b=aTpGpaDCPzpp/pH8cjhZamOiLz/Oz7VqNXGuAfTmYnSUsulPJCZ16WrbOZutO+VmJoxa+Ial0uA3zlzYlP2BsNwi3HvPPSrc26KAsKGif+di8XAZ+L1jm9eWJOgTG1Dk0xErmEyXSAyB5ENAleMKJ6FbpbkX9n2wc12ouQElb0CVTm+SvWkUyXrzlDlfcrTDXQuiRp6CSW8ZJhb4LBWYaXUnHAJVjVSuO2kPBevO+oFqcj3WW1sk4puwles/EbaAPmMMPxLHOj6XEQyPBIDMRrU5Ghl6786kgWzDABMSgJ1SngrIYdBEesH2wNrxnznhIHaopES3fsVi/po7HuM2Aw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=kneron.us; dmarc=pass action=none header.from=kneron.us; dkim=pass header.d=kneron.us; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kneron.us; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RoyVwhPkWvOwqeS6n7F5XnG19gtGWbdBJ6OhY3pVIZ4=; b=Z3yqB9RjIO9VOsxnoo68FBCRU8eSfADuMfkM94pNiMffvgwvPxGaqWK7FG+4yXVW36JyomQU1lMNgSMAoak5lepHsiCKgSUttcBPhTGG1j3dl+d+sfEIswQvIpZJNOAthLIA8+v55b7vWdQ4dTjm+WRkvrwE7G5BAkLEk/gXmlg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=kneron.us; Received: from PH0PR14MB4360.namprd14.prod.outlook.com (2603:10b6:510:26::18) by PH0PR14MB6655.namprd14.prod.outlook.com (2603:10b6:510:291::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8606.34; Fri, 11 Apr 2025 03:27:41 +0000 Received: from PH0PR14MB4360.namprd14.prod.outlook.com ([fe80::f91d:52ba:8284:3e02]) by PH0PR14MB4360.namprd14.prod.outlook.com ([fe80::f91d:52ba:8284:3e02%6]) with mapi id 15.20.8606.029; Fri, 11 Apr 2025 03:27:41 +0000 From: Chance Yang Date: Fri, 11 Apr 2025 11:27:33 +0800 Subject: [PATCH] usb: common: usb-conn-gpio: use a unique names for usb connector devices Message-Id: <20250411-work-next-v1-1-93c4b95ee6c1@kneron.us> X-B4-Tracking: v=1; b=H4sIACSM+GcC/6tWKk4tykwtVrJSqFYqSi3LLM7MzwNyDHUUlJIzE vPSU3UzU4B8JSMDI1MDE0ND3fL8omzdvNSKEt0UC0NzcwvzFDPjNCMloPqCotS0zAqwWdGxtbU A2ytCNFsAAAA= X-Change-ID: 20250411-work-next-d817787d63f2 To: Greg Kroah-Hartman , Chunfeng Yun Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, morgan.chang@kneron.us, Chance Yang X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2154; i=chance.yang@kneron.us; h=from:subject:message-id; bh=MzN1eSIVj8IAWiceALmI5C5WO6BfNntcg582znkMtDA=; b=owGbwMvMwCVmsuR+7eedxj8YT6slMaT/6NFkvlPK/fixqtJyHZW5Qc9fMH4WNH/aFf5YSli34 rN00Hb3jlIWBjEuBlkxRZbP2Ur7vVua59260rMfZg4rE8gQBi5OAZiI6lxGhpec4bduTI/V0iyt KRGq7LQM1/R/tSFy096uqjpxd95Cb0aGW/Mfvl/B+FUvd0v+7Z33t7DLcGiuPRDGXRyoyienL5r ODQA= X-Developer-Key: i=chance.yang@kneron.us; a=openpgp; fpr=F36B22BF4B84839EDAD48CBF34A4DF7DF3B933F8 X-ClientProxiedBy: TPYP295CA0052.TWNP295.PROD.OUTLOOK.COM (2603:1096:7d0:8::18) To PH0PR14MB4360.namprd14.prod.outlook.com (2603:10b6:510:26::18) Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PH0PR14MB4360:EE_|PH0PR14MB6655:EE_ X-MS-Office365-Filtering-Correlation-Id: ba5d625d-9f9c-4cfe-2109-08dd78a8d10f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|52116014|1800799024|366016|38350700014|80162021; X-Microsoft-Antispam-Message-Info: =?utf-8?q?xULJQS+l0w8RNHR1iVJPWYKY/Iay2qZ?= =?utf-8?q?nKyLQHPBaFqHHWw88IGaW3q1evCD38ZJXYV1cbTJ0EryVkOnspZF6RgWb6Bi6MG1A?= =?utf-8?q?DMz7ofEnexuyMTynnXhHgJSF2mUOzfX6QTCA0RCoIlgQhmfFm8CFQlnV1ct28EEhf?= =?utf-8?q?9hyY4H9sE1DX5jgLIXM33v+w6ef2BZNhslgzwmiqPQ1DYfKgPYddLvikJ99r0bqJH?= =?utf-8?q?GlwdNyMrZKiqe5Q0104KjBFFY3ejjav0bw3ClZlmjsJdyMTbs+1i1codF0HUFuW3G?= =?utf-8?q?Di9j80QRpfIXpjYDFi5ehPNB67A4ocbVmxpt+1+4AXLKnTmgtub86wpm7YWSP4zgk?= =?utf-8?q?eC2hVc2LBV/3fbvjttgqBw7sclV1ps5jSnNf8ElTMhCjUls09Ay1MX2hyi9iJIViz?= =?utf-8?q?aUJZXlWJXIGFEtONbpC5fq3w1NUPT6jkYl0Yby4pWEbeNPRs0Kza48uZur9BMFXjV?= =?utf-8?q?T5klwekMc6zSwULDkY671EdRm5yRf8nu8LbCBjQmzCiFwxilh2LSX5v2ZSsbchgrk?= =?utf-8?q?FIp+ht1wZ/6+09GDVY8eSpYWSLcBkapc+0EQH1ciT0a3Tcx92bn4FzhNvZseLqCMo?= =?utf-8?q?PdbrGKkQDpYAt46JGjAjdtKToBWOagh5/mSID1CR4bJvMACVH0fszGTU5/U4G/Lxy?= =?utf-8?q?bBmjmCxcvSsJrkHzsqwkCcs0tDQKAyrqJEMGVAc7+KdnurYAUSGRViM9ROndUZtaz?= =?utf-8?q?F+qfOWJumL4BIPprLpJf/0KIXj0yx6VTdNsSifst7rD2aeAkgupWhNZkKFdsDuOy/?= =?utf-8?q?Ss0yKthwtKOzfFJhcyF5xC7edtNNGPMOzC9KWGDMys2WRZWiJvaS9SgdPLjNnEfSG?= =?utf-8?q?FKc/NvyjBqhDCuSb+9ZAJcBcZ4Sjeal5d86FVn2MWTg1H524/LqA8skHZLJWeBT9A?= =?utf-8?q?XkAQqMJNfhWHKWI/DpyebyfEJ74J6cRzVLNDSaAVsHsu3mu5wvsklLyFKEiQpy/JF?= =?utf-8?q?crDLqDgLji3vH9XRA0Eylh1S2P5qDwxU8lnZPjriw8hEmdiHL8hJdEMJeifbng4BQ?= =?utf-8?q?Gnnx85vr4imlA3n+gUNCc1PK8+0EVmcRNHNDB/dl/fpqsZg8Q5X+J64wXM40xTwfZ?= =?utf-8?q?VdV7D+kgr0Couu5RK336hIUlOdMB3KOPikXHDgoljoa5qKCoMExDFP9tF3mHBarKz?= =?utf-8?q?o+LL4M6ISpekJZ8ITt2MTIR8c+pRfzFZuNgPadJuZsYtnDgS2xOSN3SeLa0o5mpTc?= =?utf-8?q?PFfL2TzfIgH4NIV0GORZlM8mbTcuTHkXS7uhsSPPY3CRv1lyeTyBTy2vRDOAyDUIK?= =?utf-8?q?yfwlUYJhIGMpHmXBL7Bkid2x8lhrmGBk+jVdJwxiUqlyEXe5PNQTY5IO/awTqCWbB?= =?utf-8?q?FfWF/8mc+GjdlyrBjJX5uDp05Pm314UIybHRAzYfFn1Wth5TUSBaRUqSrkD8vnVBG?= =?utf-8?q?oiuKuFWD/3Mc8kBBQrajwP8CpysoxRf9f8CzW2I6UaYB7FbqByQB8/PxjV8mgg/rt?= =?utf-8?q?XePaN/Iu04?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH0PR14MB4360.namprd14.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(376014)(52116014)(1800799024)(366016)(38350700014)(80162021);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?bkJAYpu3VGez5S+it3VruyayWfkG?= =?utf-8?q?xAzWE55sX9sgNoWcdFQRCITX56j6PB+uobS+DwzJwn5Lm+yBPAc/nd/xXqSWOzbh+?= =?utf-8?q?qPeZcLPEmxGMAM1WRQ+v2+Ng+Ib1rO8OEFAcFe6bEW6y6r43KNe58Ta7CqYKsPU6e?= =?utf-8?q?367GOS3qidQhpD5Eug2J6ttGO+ULn7jCDeY/wTVrxZvl+EhAjlPN3edmNR2yA+joh?= =?utf-8?q?caMkP9vaLww4ASdA8hTXU8QM8K4w2HbyNq46Kwt71mkgapKxq2mqW67EIETnDLhxo?= =?utf-8?q?0smBJFRtkfO/QniqXHlU/y4VuYhprE7ni/0DkpkCUSHi62WZn0wJaoq0qFF31q/2Z?= =?utf-8?q?BaKIjPCNtbCkoQDybLRw5uzx06xJLQBaF9Qvitv7hCHQ6HIRSNSbcuyjN9VikGNo7?= =?utf-8?q?Net9ZFjhpKdWQyt7iZhHPTqFj0Nd77RnVQemRf0sKZmjXZOgDCUMmL0vqBbi35zXS?= =?utf-8?q?ckmmsztG1iJb1bHmyNgEsDC1uRYM4qEt5JE4iY94bVRwbBu8xt81kOtxSO1BTawTd?= =?utf-8?q?5y/S1GjAj/J/oa1AaYUUaZJ+INCNw4TJEG+YIdQrkO8epM1JsAhYYLTHXSdyrBhYf?= =?utf-8?q?U3kki9G+cYyUSy6zR057WoyCeqdKh0V7kGfpuzQmbTqnN0cdSxDWbt6bUEu1JGNjq?= =?utf-8?q?qEgNk20viSuwF/3YFfFC8tTiVUdi5+GY91fdumW7uL6YzwTpmmtw9k+kv9nTP1eus?= =?utf-8?q?TmoRg/vmGPIyrkDv3THYjE7MeF+WIn8HttPeNv8eYWh0DFci3mfmeS14sM0hlQmsA?= =?utf-8?q?vswrzt67MzwlGSM+iWONuZvSc5ie5oPIDXOJ325y2xdVIbzR7tUbfH8JsBEbcSKxX?= =?utf-8?q?2ulJp93B40/+J0LVHsQHmjEof/Uk736Yo9AvTHdsf9eIhiyr56FVF6ls3iKNjXYpI?= =?utf-8?q?Pp5qi1LobBkSkr3K72uDBMSv3A3iRjY97Ug05LyIya40lFJ6+UbGQkmHNcv8tirl2?= =?utf-8?q?XXvqiezbmDm18hkJcGsGXgen+AHNJ30rJE++EYNSD7DeEHkjw5/Vog6axECOjA05L?= =?utf-8?q?ycNaP9GJ4GExJx3RHpiO6W+BDqz+kDa5l0osHYqqoPOplF7Cm2cgglAW7DmImYE1Z?= =?utf-8?q?Qkdtl/O2g1zJdFnr2DBImL+YRHbHc4xP+vkJxoCsPT2C9GfiQIPm/Kgf4JD7RC9Qo?= =?utf-8?q?Ghf3xFZy+C7IRaky2KRKrKrF3mBaXMzr51UwpL2ovcYRinmTz7e9Tz2/HcoZ5fyWv?= =?utf-8?q?q60R/YbPLuC7agUCYAixvR27NwEITQDYMtSEadjnyBfNIlqza6IG/H7U8dGOVx6xR?= =?utf-8?q?dPoyxDXffOOj7gLUJSc3mNSd6KRhSzSxBr7YL1Z6s+2UOA6+QeK3qVvjbHf8EAXaR?= =?utf-8?q?cFY/Hl6eYupN3utIC7D2SvfomqxVpz9q4zHM6uEk6An/gZUMpaZ6+mC7F15QtK8oh?= =?utf-8?q?JD4dc5v22DqiUL3qRSRcnp9yaPbCDFX3xEPG7e5IEobR39d9AxNhK69nML47+YoyW?= =?utf-8?q?2jqC8/5fTZ2sR5YaSqaH7bBap/6uz5qRxqpVeJrPX8syYW1qJPQplMSIZl1YkEoHS?= =?utf-8?q?IgR4BxX7Ddus?= X-OriginatorOrg: kneron.us X-MS-Exchange-CrossTenant-Network-Message-Id: ba5d625d-9f9c-4cfe-2109-08dd78a8d10f X-MS-Exchange-CrossTenant-AuthSource: PH0PR14MB4360.namprd14.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Apr 2025 03:27:41.6567 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f92b0f4b-650a-4d8a-bae3-0e64697d65f2 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: B5mnCOED1s6oSaLUlljkOLaRzhXcpwZcXyFXurh3ff+JwSURAnfyK9XWcbPIDwJ/H6QHsMiPjFviWh7kbF9Yyw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR14MB6655 The current implementation uses "usb-charger" as a generic name for usb connector. This prevents us to have two usb connector devices attached as the power system will complain about the name which is already registered. Use an incremental name for each usb connector attached. Fixes: 880287910b189 ("usb: common: usb-conn-gpio: fix NULL pointer dereference of charger") Signed-off-by: Chance Yang --- This patch addresses an issue in the usb-conn-gpio driver where the generic "usb-charger" name is used for all USB connector devices. This causes conflicts in the power supply subsystem when multiple USB connectors are present, as duplicate names are not allowed. The fix introduces an incremental naming scheme (e.g., usb-charger-0, usb-charger-1) for each USB connector device, ensuring uniqueness and preventing registration errors. --- drivers/usb/common/usb-conn-gpio.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) --- base-commit: 0af2f6be1b4281385b618cb86ad946eded089ac8 change-id: 20250411-work-next-d817787d63f2 Best regards, diff --git a/drivers/usb/common/usb-conn-gpio.c b/drivers/usb/common/usb-conn-gpio.c index 1e36be2a28fd5ca5e1495b7923e4d3e25d7cedef..2702e1a26634770500febd567f9d0891e63a8c4c 100644 --- a/drivers/usb/common/usb-conn-gpio.c +++ b/drivers/usb/common/usb-conn-gpio.c @@ -155,13 +155,19 @@ static int usb_charger_get_property(struct power_supply *psy, static int usb_conn_psy_register(struct usb_conn_info *info) { + static atomic_t usb_conn_no = ATOMIC_INIT(0); + unsigned long n; struct device *dev = info->dev; struct power_supply_desc *desc = &info->desc; struct power_supply_config cfg = { .fwnode = dev_fwnode(dev), }; - desc->name = "usb-charger"; + n = atomic_inc_return(&usb_conn_no) - 1; + desc->name = devm_kasprintf(dev, GFP_KERNEL, "usb-charger-%ld", n); + if (!desc->name) + return -ENOMEM; + desc->properties = usb_charger_properties; desc->num_properties = ARRAY_SIZE(usb_charger_properties); desc->get_property = usb_charger_get_property;