From patchwork Fri Aug 14 19:37:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dustin Byford X-Patchwork-Id: 507564 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B5BF61401E7 for ; Sat, 15 Aug 2015 05:38:10 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b=P1ndIyn5; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751722AbbHNTht (ORCPT ); Fri, 14 Aug 2015 15:37:49 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:33450 "EHLO mail-pa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751595AbbHNThq (ORCPT ); Fri, 14 Aug 2015 15:37:46 -0400 Received: by pabyb7 with SMTP id yb7so65558482pab.0 for ; Fri, 14 Aug 2015 12:37:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cumulusnetworks.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=x/nBNOM/48/I/7Cl50a5uzny78lvjng6mBsmG8l+vqw=; b=P1ndIyn5LqUj33icLAmNiclCrFHAYd9xUOJgSbq9N/tT8rs7caI/SxmIpzNXDe9+fs Sr0ioo1NEhOwBt3QO9qKZcrIaQITqSksznexqJZvkjvr6zHfk4ZEiFAoVETR/jl3yjgg 6h7UhPZKKUpLo+Lx5/oaqPE2C3J0dOePrLKkY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=x/nBNOM/48/I/7Cl50a5uzny78lvjng6mBsmG8l+vqw=; b=dInC5mnW0bnyV3wIrszWY01RaukUNGFVjiXNz0Jq2qTCzVq+nVVvzFio3hxcrd5E4P 3WecsNOD0s9NkdJLuCKdZC/LorskiEqBaDTApb9jdlEfR26j9vGJq8OMa6QJhF9JVnGG 7wk5sKUxvpQRcVETrKB/GMu5lvQdR6MtauTMh3esTqwNBBmnoRFVqOi+DTDucp5mIJ8a fbwsIJHqi7LKIR0q/+CCZiKJmDCX6VSoisJyBEtdSAOrsPvFfYOITP4UnzqqpbUwM2ev r6dhMQxnPwMJrfR0EKibH6A7hQfwEaZX0lf8zVrInpU8ue65iFI2vp7sSLAIuC0A44TV HOLg== X-Gm-Message-State: ALoCoQk/NPydOz90VidIfk8j2nrdchTjf8gMkGRsBPjH8slsNPmoXx+q15q3TljKPMPDGoKBGIkW X-Received: by 10.66.162.229 with SMTP id yd5mr24027434pab.102.1439581066214; Fri, 14 Aug 2015 12:37:46 -0700 (PDT) Received: from magnum.cumulusnetworks.com ([216.129.126.126]) by smtp.gmail.com with ESMTPSA id u10sm6895364pbs.16.2015.08.14.12.37.45 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Aug 2015 12:37:45 -0700 (PDT) Received: by magnum.cumulusnetworks.com (Postfix, from userid 1016) id 2F3AF8A1D91; Fri, 14 Aug 2015 12:37:45 -0700 (PDT) From: Dustin Byford To: Wolfram Sang , linux-i2c@vger.kernel.org Cc: linux-kernel@vger.kernel.org, jarkko.nikula@linux.intel.com, jdelvare@suse.com, linux@roeck-us.net, lm-sensors@lm-sensors.org, rjw@rjwysocki.net, linux-acpi@vger.kernel.org Subject: [RFC 1/1] i2c: acpi: revert setting a "stable" device name Date: Fri, 14 Aug 2015 12:37:14 -0700 Message-Id: <1439581034-5972-2-git-send-email-dustin@cumulusnetworks.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1439581034-5972-1-git-send-email-dustin@cumulusnetworks.com> References: <1439581034-5972-1-git-send-email-dustin@cumulusnetworks.com> Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org 70762ab from 11/2014 (i2c: Use stable dev_name for ACPI enumerated I2C slaves) modified the sysfs-visible dev_name() for ACPI enumerated I2C devices. With that change, /sys/bus/i2c/devices/i2c-0-004a, for example, became /sys/bus/i2c/devices/i2c-PNPXXXX:xx That causes problems for userspace code such as 'sensors' which does this: lib/sysfs.c:665: if ((!subsys || !strcmp(subsys, "i2c")) && sscanf(dev_name, "%hd-%x", &entry.chip.bus.nr, &entry.chip.addr) == 2) { ... Fix 'sensors' by reverting the kernel change. Signed-off-by: Dustin Byford --- drivers/i2c/i2c-core.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c index c83e4d1..fb77031 100644 --- a/drivers/i2c/i2c-core.c +++ b/drivers/i2c/i2c-core.c @@ -916,13 +916,6 @@ EXPORT_SYMBOL_GPL(i2c_unlock_adapter); static void i2c_dev_set_name(struct i2c_adapter *adap, struct i2c_client *client) { - struct acpi_device *adev = ACPI_COMPANION(&client->dev); - - if (adev) { - dev_set_name(&client->dev, "i2c-%s", acpi_dev_name(adev)); - return; - } - /* For 10-bit clients, add an arbitrary offset to avoid collisions */ dev_set_name(&client->dev, "%d-%04x", i2c_adapter_id(adap), client->addr | ((client->flags & I2C_CLIENT_TEN)