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 X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 183E6C2D0F2 for ; Wed, 1 Apr 2020 09:51:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DFAEE20772 for ; Wed, 1 Apr 2020 09:51:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585734716; bh=+eUndFHgJ1dEXfj+ojdHLS9mWOirogiLA+FqUsv1IgI=; h=From:To:Cc:Subject:Date:List-ID:From; b=ebZvF0nyC4CGJ6otSL4qWFk7HF9aWQ8qeEv8K6QBi1i0Hu4PlAF/klypNqnwU31cp Nt+ujuXExwhCPKO3DZfS+ttJSuHnl2gChcm0fm0MgrWH+F2fv0jpl4hPkDHfmH6zIK BFdBDtwHhFJLZFf3z9O74FPST6mr0X3mnHvKmlLI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731537AbgDAJvy (ORCPT ); Wed, 1 Apr 2020 05:51:54 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:40981 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725860AbgDAJvy (ORCPT ); Wed, 1 Apr 2020 05:51:54 -0400 Received: by mail-wr1-f65.google.com with SMTP id h9so29737142wrc.8; Wed, 01 Apr 2020 02:51:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ZCD5e/zJXmKAX2xCPUbGFpEcZHshYsLsh9gx/j5UW0I=; b=bi80T+giF68sM8ftFWK9bZPS+hpjXMmcYzSpq1NJje2+6fFydWLm51hR3sCeLTwMBl iQuvSilcSJTLG+lxHWSyZPu8UDAma/VLD6BlQAM9PWvHQUpFOiqCkbikf3FAhdxfUkbi kU5NVIKN/ujxtNU/cN8sGuYh4fASqGaAOCDioUVIo4xth3V5AkGdpGdBnIKc9PPl+dq1 58ZJK6HQM1Mkurm6xRGDdGaGpMtRkmImZ6LKTGs6AruxtuzivcvaUrjeC3Stq+OGjKTv hFSjBH33xEk2pEkAnNl6whAmroKh6ZGrVjhFAGwdpVbC5btZL++pHHqLMN8CAEy8iCnJ mndg== X-Gm-Message-State: ANhLgQ0aZc+4Py+5HwoYOrbbFiez6clMPblPPpdjDZXVMz2/2xP8XYA6 6kj0iw5P207lh7r5ovqRtuA= X-Google-Smtp-Source: ADFU+vvyLTq9Vwo1E/Y7vOiZ5MDDMqJghjVelLsqU/ox9sZhwAGPZinVWHQpB0MOJ//7Bng3s1r0qw== X-Received: by 2002:a5d:630e:: with SMTP id i14mr25120880wru.260.1585734711210; Wed, 01 Apr 2020 02:51:51 -0700 (PDT) Received: from piling.lan (80-71-134-83.u.parknet.dk. [80.71.134.83]) by smtp.gmail.com with ESMTPSA id d7sm2154635wrr.77.2020.04.01.02.51.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Apr 2020 02:51:50 -0700 (PDT) From: Ricardo Ribalda Delgado To: Jacek Anaszewski , Pavel Machek , Dan Murphy , Linus Walleij , linux-leds@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ricardo Ribalda Delgado Subject: [PATCH] leds: core: Fix warning message when init_data Date: Wed, 1 Apr 2020 11:51:47 +0200 Message-Id: <20200401095147.444353-1-ribalda@kernel.org> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The warning message when a led is renamed due to name collition can fail to show proper original name if init_data is used. Eg: [ 9.073996] leds-gpio a0040000.leds_0: Led (null) renamed to red_led_1 due to name collision Fixes: bb4e9af0348d ("leds: core: Add support for composing LED class device names") Signed-off-by: Ricardo Ribalda Delgado --- drivers/leds/led-class.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c index 1fc40e8af75e..3363a6551a70 100644 --- a/drivers/leds/led-class.c +++ b/drivers/leds/led-class.c @@ -376,7 +376,7 @@ int led_classdev_register_ext(struct device *parent, if (ret) dev_warn(parent, "Led %s renamed to %s due to name collision", - led_cdev->name, dev_name(led_cdev->dev)); + proposed_name, dev_name(led_cdev->dev)); if (led_cdev->flags & LED_BRIGHT_HW_CHANGED) { ret = led_add_brightness_hw_changed(led_cdev); -- 2.25.1