macintosh: Convert to using %pOFn instead of device_node.name
PATCH v2 1/1 macintosh: Convert to using %pOFn instead of device_node.name
In preparation to remove the node name pointer from struct device_node, convert printf users to use the %pOFn format specifier.
Cc Benjamin Herrenschmidt <[email protected]>
Signed-off-by Rob Herring <[email protected]>
---
v2: Add setting dev_name in macio_asic.c
drivers/macintosh/macio_asic.c | 8 ++++---- drivers/macintosh/macio_sysfs.c | 8 +++++++- drivers/macintosh/windfarm_smu_controls.c | 4 ++-- 3 files changed, 13 insertions(+), 7 deletions(-)
drivers/macintosh/macio_asic.c +4 -4
@@ -403,19 +403,19 @@ static struct macio_dev * macio_add_one_device(struct macio_chip *chip,/* MacIO itself has a different reg, we use it's PCI base */ if (np == chip->of_node) { -dev_set_name (&dev->ofdev.dev,"%1d.%08x:%.*s" , +dev_set_name (&dev->ofdev.dev,"%1d.%08x:%.*pOFn" , chip->lbus.index, #ifdef CONFIG_PCI (unsigned int)pci_resource_start(chip->lbus.pdev, 0), #else0 ,/* NuBus may want to do something better here */ #endif -MAX_NODE_NAME_SIZE , np->name); +MAX_NODE_NAME_SIZE , np); }else { reg =of_get_property (np,"reg" ,NULL ); -dev_set_name (&dev->ofdev.dev,"%1d.%08x:%.*s" , +dev_set_name (&dev->ofdev.dev,"%1d.%08x:%.*pOFn" , chip->lbus.index, - reg ? *reg :0 ,MAX_NODE_NAME_SIZE , np->name); + reg ? *reg :0 ,MAX_NODE_NAME_SIZE , np); }/* Setup interrupts & resources */
drivers/macintosh/macio_sysfs.c +7 -1
@@ -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[] = {
drivers/macintosh/windfarm_smu_controls.c +2 -2
@@ -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);
Signature · 1 line
2.17.1