From patchwork Tue Aug 28 01:52:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 145258 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp609586ljw; Mon, 27 Aug 2018 18:54:57 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYLYyJuD3f+D5PI1qRyzoMWnowThfPahDWfrq0JFwgOy1SriIAAXJL/g7pAGAwc9DXDY0+z X-Received: by 2002:a17:902:70cb:: with SMTP id l11-v6mr15116777plt.91.1535421297006; Mon, 27 Aug 2018 18:54:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535421296; cv=none; d=google.com; s=arc-20160816; b=FKB8u+J6ORq7R8ZFKeug13eC5Mg2d0+BElPK46BGHdbyZifyvs66Z3tKV3KqeSfahE Ri/FNqJwkpE0mx46ztIhIr1nIR5kYV2tHsk4DPOE7PcI0lDdnwM6O/qV3Re6lQq/C+Aj FI7QStwGDEWt0F7FL0E5hELAv6lOu2BVqhewv84XcAUn1lImfh4S3s8kflOYOcU/tjfI y/TFZ8Q7jrj4QwRKXXjkppYDUBt0L/kvVQjfVK4rS/+sBHzDGfhn3BAajqJMJIFViCZK lDTXx/ejqPuRdR85NfkPiDIggSroxHcAPFuLo9U1fSXnMvsVJUYYSNqMms4CpD/oEdA9 FMwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=Xqp+qIL0DVWoiHlShF0GYKNsAVZb6YYMRMH+l1IlfPU=; b=fQp+Ugo4oi9l7Fne3Ty5mJoVBsMxoXMXtDXhJxiV4IpkcaPOEwF5opuC2x4nKkV/Jq ctEoEvrDTflh8vPBP6xxYHnuWw4UDPJeEBSgm+XSj127AyEflgBkjU6gpA8+3URqR/oo MO57TjQPv2EIqwcnr6jm1+/IgAq9NUGtwc5+sam//WmCP+6cudL0yiTgp3jfG9Tc7rM+ UcuzIMS8zxfTkE+XC4dXFxcLDfJIodu/CCbqNdHaSrAwqwBMRnIsYYkGYDtEKcyAPHnQ RMW5HCwvw8HA+4iE5HkKXu2/VcRhHiR2IWRnGKrnqbePTVAtmSdOTz+4cRaSsLPeFUD5 3Alg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a143-v6si1116903pfd.241.2018.08.27.18.54.56; Mon, 27 Aug 2018 18:54:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727792AbeH1FoJ (ORCPT + 32 others); Tue, 28 Aug 2018 01:44:09 -0400 Received: from mail-oi0-f66.google.com ([209.85.218.66]:34428 "EHLO mail-oi0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727595AbeH1FoI (ORCPT ); Tue, 28 Aug 2018 01:44:08 -0400 Received: by mail-oi0-f66.google.com with SMTP id 13-v6so46159ois.1 for ; Mon, 27 Aug 2018 18:54:53 -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:in-reply-to :references; bh=Xqp+qIL0DVWoiHlShF0GYKNsAVZb6YYMRMH+l1IlfPU=; b=dNh0a/eVDketWsqQuY4SAQE3JgJVaTOHpkJqqbPefJ6VJbi58yspFe5r0MOd9GxWUw wbqlS3KBF+Dpsj24he0vwEflQHNZz/BV2Sv324Z5TGGTJbc/KbCJNnZ8nYRBJnuvLt7Q 1IgaVgTpBiOiU4Dt8PkR43egrYrlJTQ5zItK3v++SNC/gBfRCDC67FiqcrAn6WOhFmBz 8IHhsEXo9luIyU/rI+UDOMDNK1p2T3NFUXOn/k7U7FZ8z1cO71ydb0mcDNMwJeKbTrtg Brkd24YRWpTsjMIqyPNNC5R2PgWb5lLwbgxX7biTrenlcYNQluzJOnYqffzdApEOWJoG f12Q== X-Gm-Message-State: APzg51BNJF0538thpo4kuyrigX3hm4iduTmEn4wD3UzlKET71KppYHrh k9RCqxItiGR08YUhpBuOoK6N0rE= X-Received: by 2002:aca:b885:: with SMTP id i127-v6mr1127312oif.180.1535421292576; Mon, 27 Aug 2018 18:54:52 -0700 (PDT) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id n71-v6sm1652696oig.48.2018.08.27.18.54.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Aug 2018 18:54:51 -0700 (PDT) From: Rob Herring To: linux-kernel@vger.kernel.org Cc: Benjamin Herrenschmidt , linuxppc-dev@lists.ozlabs.org Subject: [PATCH] macintosh: Convert to using %pOFn instead of device_node.name Date: Mon, 27 Aug 2018 20:52:27 -0500 Message-Id: <20180828015252.28511-26-robh@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180828015252.28511-1-robh@kernel.org> References: <20180828015252.28511-1-robh@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In preparation to remove the node name pointer from struct device_node, convert printf users to use the %pOFn format specifier. Cc: Benjamin Herrenschmidt Cc: linuxppc-dev@lists.ozlabs.org Signed-off-by: Rob Herring --- drivers/macintosh/macio_sysfs.c | 8 +++++++- drivers/macintosh/windfarm_smu_controls.c | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) -- 2.17.1 diff --git a/drivers/macintosh/macio_sysfs.c b/drivers/macintosh/macio_sysfs.c index ca4fcffe454b..d2451e58acb9 100644 --- a/drivers/macintosh/macio_sysfs.c +++ b/drivers/macintosh/macio_sysfs.c @@ -58,7 +58,13 @@ static ssize_t devspec_show(struct device *dev, static DEVICE_ATTR_RO(modalias); static DEVICE_ATTR_RO(devspec); -macio_config_of_attr (name, "%s\n"); +static ssize_t name_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + return sprintf(buf, "%pOFn\n", dev->of_node); +} +static DEVICE_ATTR_RO(name); + macio_config_of_attr (type, "%s\n"); static struct attribute *macio_dev_attrs[] = { diff --git a/drivers/macintosh/windfarm_smu_controls.c b/drivers/macintosh/windfarm_smu_controls.c index d174c7437337..86d65462a61c 100644 --- a/drivers/macintosh/windfarm_smu_controls.c +++ b/drivers/macintosh/windfarm_smu_controls.c @@ -277,7 +277,7 @@ static int __init smu_controls_init(void) fct = smu_fan_create(fan, 0); if (fct == NULL) { printk(KERN_WARNING "windfarm: Failed to create SMU " - "RPM fan %s\n", fan->name); + "RPM fan %pOFn\n", fan); continue; } list_add(&fct->link, &smu_fans); @@ -296,7 +296,7 @@ static int __init smu_controls_init(void) fct = smu_fan_create(fan, 1); if (fct == NULL) { printk(KERN_WARNING "windfarm: Failed to create SMU " - "PWM fan %s\n", fan->name); + "PWM fan %pOFn\n", fan); continue; } list_add(&fct->link, &smu_fans);