From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rob Herring Subject: [PATCH] gpio: Convert to using %pOF instead of full_name Date: Tue, 18 Jul 2017 16:43:03 -0500 Message-ID: <20170718214339.7774-23-robh@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: Linus Walleij Cc: devicetree@vger.kernel.org, Florian Fainelli , Alexandre Courbot , Tien Hock Loh , linux-kernel@vger.kernel.org, Michal Simek , linux-gpio@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org, Gregory Fong , Brian Norris , =?UTF-8?q?S=C3=B6ren=20Brinkmann?= List-Id: linux-gpio@vger.kernel.org Tm93IHRoYXQgd2UgaGF2ZSBhIGN1c3RvbSBwcmludGYgZm9ybWF0IHNwZWNpZmllciwgY29udmVy dCB1c2VycyBvZgpmdWxsX25hbWUgdG8gdXNlICVwT0YgaW5zdGVhZC4gVGhpcyBpcyBwcmVwYXJh dGlvbiB0byByZW1vdmUgc3RvcmluZwpvZiB0aGUgZnVsbCBwYXRoIHN0cmluZyBmb3IgZWFjaCBu b2RlLgoKU2lnbmVkLW9mZi1ieTogUm9iIEhlcnJpbmcgPHJvYmhAa2VybmVsLm9yZz4KQ2M6IFRp ZW4gSG9jayBMb2ggPHRobG9oQGFsdGVyYS5jb20+CkNjOiBMaW51cyBXYWxsZWlqIDxsaW51cy53 YWxsZWlqQGxpbmFyby5vcmc+CkNjOiBBbGV4YW5kcmUgQ291cmJvdCA8Z251cm91QGdtYWlsLmNv bT4KQ2M6IEdyZWdvcnkgRm9uZyA8Z3JlZ29yeS4weGYwQGdtYWlsLmNvbT4KQ2M6IEJyaWFuIE5v cnJpcyA8Y29tcHV0ZXJzZm9ycGVhY2VAZ21haWwuY29tPgpDYzogRmxvcmlhbiBGYWluZWxsaSA8 Zi5mYWluZWxsaUBnbWFpbC5jb20+CkNjOiBiY20ta2VybmVsLWZlZWRiYWNrLWxpc3RAYnJvYWRj b20uY29tCkNjOiBNaWNoYWwgU2ltZWsgPG1pY2hhbC5zaW1la0B4aWxpbnguY29tPgpDYzogIlPD tnJlbiBCcmlua21hbm4iIDxzb3Jlbi5icmlua21hbm5AeGlsaW54LmNvbT4KQ2M6IGxpbnV4LWdw aW9Admdlci5rZXJuZWwub3JnCkNjOiBsaW51eC1hcm0ta2VybmVsQGxpc3RzLmluZnJhZGVhZC5v cmcKLS0tCiBkcml2ZXJzL2dwaW8vZ3Bpby1hbHRlcmEuYyAgfCAgNCArKy0tCiBkcml2ZXJzL2dw aW8vZ3Bpby1icmNtc3RiLmMgfCAgMiArLQogZHJpdmVycy9ncGlvL2dwaW8tZ2UuYyAgICAgIHwg IDYgKystLS0tCiBkcml2ZXJzL2dwaW8vZ3Bpby1ncmdwaW8uYyAgfCAgMiArLQogZHJpdmVycy9n cGlvL2dwaW8tbXBjOHh4eC5jIHwgIDQgKystLQogZHJpdmVycy9ncGlvL2dwaW8tdGIxMHguYyAg IHwgIDMgKystCiBkcml2ZXJzL2dwaW8vZ3Bpby10ejEwOTAuYyAgfCAxMCArKysrLS0tLS0tCiBk cml2ZXJzL2dwaW8vZ3Bpby14aWxpbnguYyAgfCAgNCArKy0tCiBkcml2ZXJzL2dwaW8vZ3Bpb2xp Yi1vZi5jICAgfCAyOSArKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLQogZHJpdmVycy9ncGlv L2dwaW9saWIuYyAgICAgIHwgIDIgKy0KIDEwIGZpbGVzIGNoYW5nZWQsIDMxIGluc2VydGlvbnMo KyksIDM1IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3Bpby9ncGlvLWFsdGVy YS5jIGIvZHJpdmVycy9ncGlvL2dwaW8tYWx0ZXJhLmMKaW5kZXggMTc0ODVkYzIwMzg0Li5jY2Mw MmVkNjViM2MgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3Bpby9ncGlvLWFsdGVyYS5jCisrKyBiL2Ry aXZlcnMvZ3Bpby9ncGlvLWFsdGVyYS5jCkBAIC0zMjQsOCArMzI0LDggQEAgc3RhdGljIGludCBh bHRlcmFfZ3Bpb19wcm9iZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQogCXJldHVybiAw OwogdGVhcmRvd246CiAJb2ZfbW1fZ3Bpb2NoaXBfcmVtb3ZlKCZhbHRlcmFfZ2MtPm1tY2hpcCk7 Ci0JcHJfZXJyKCIlczogcmVnaXN0cmF0aW9uIGZhaWxlZCB3aXRoIHN0YXR1cyAlZFxuIiwKLQkJ bm9kZS0+ZnVsbF9uYW1lLCByZXQpOworCXByX2VycigiJXBPRjogcmVnaXN0cmF0aW9uIGZhaWxl ZCB3aXRoIHN0YXR1cyAlZFxuIiwKKwkJbm9kZSwgcmV0KTsKCiAJcmV0dXJuIHJldDsKIH0KZGlm ZiAtLWdpdCBhL2RyaXZlcnMvZ3Bpby9ncGlvLWJyY21zdGIuYyBiL2RyaXZlcnMvZ3Bpby9ncGlv LWJyY21zdGIuYwppbmRleCBlNjQ4OTE0MzcyMWEuLjczZjJjM2JlNDY1NyAxMDA2NDQKLS0tIGEv ZHJpdmVycy9ncGlvL2dwaW8tYnJjbXN0Yi5jCisrKyBiL2RyaXZlcnMvZ3Bpby9ncGlvLWJyY21z dGIuYwpAQCAtNDgzLDcgKzQ4Myw3IEBAIHN0YXRpYyBpbnQgYnJjbXN0Yl9ncGlvX3Byb2JlKHN0 cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCgogCQlnYy0+b2Zfbm9kZSA9IG5wOwogCQlnYy0+ b3duZXIgPSBUSElTX01PRFVMRTsKLQkJZ2MtPmxhYmVsID0gbnAtPmZ1bGxfbmFtZTsKKwkJZ2Mt PmxhYmVsID0gZGV2bV9rYXNwcmludGYoZGV2LCBHRlBfS0VSTkVMLCAiJXBPRiIsIGRldi0+b2Zf bm9kZSk7CiAJCWdjLT5iYXNlID0gZ3Bpb19iYXNlOwogCQlnYy0+b2ZfZ3Bpb19uX2NlbGxzID0g MjsKIAkJZ2MtPm9mX3hsYXRlID0gYnJjbXN0Yl9ncGlvX29mX3hsYXRlOwpkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncGlvL2dwaW8tZ2UuYyBiL2RyaXZlcnMvZ3Bpby9ncGlvLWdlLmMKaW5kZXggODY1 MGIyOTE2Zjg3Li42ZjVhN2ZlOTc4N2QgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3Bpby9ncGlvLWdl LmMKKysrIGIvZHJpdmVycy9ncGlvL2dwaW8tZ2UuYwpAQCAtNzYsOCArNzYsNyBAQCBzdGF0aWMg aW50IF9faW5pdCBnZWZfZ3Bpb19wcm9iZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQog CX0KCiAJLyogU2V0dXAgcG9pbnRlcnMgdG8gY2hpcCBmdW5jdGlvbnMgKi8KLQlnYy0+bGFiZWwg PSBkZXZtX2tzdHJkdXAoJnBkZXYtPmRldiwgcGRldi0+ZGV2Lm9mX25vZGUtPmZ1bGxfbmFtZSwK LQkJCQkgICAgIEdGUF9LRVJORUwpOworCWdjLT5sYWJlbCA9IGRldm1fa2FzcHJpbnRmKCZwZGV2 LT5kZXYsIEdGUF9LRVJORUwsICIlcE9GIiwgcGRldi0+ZGV2Lm9mX25vZGUpOwogCWlmICghZ2Mt PmxhYmVsKSB7CiAJCXJldCA9IC1FTk9NRU07CiAJCWdvdG8gZXJyMDsKQEAgLTk2LDggKzk1LDcg QEAgc3RhdGljIGludCBfX2luaXQgZ2VmX2dwaW9fcHJvYmUoc3RydWN0IHBsYXRmb3JtX2Rldmlj ZSAqcGRldikKIAlyZXR1cm4gMDsKIGVycjA6CiAJaW91bm1hcChyZWdzKTsKLQlwcl9lcnIoIiVz OiBHUElPIGNoaXAgcmVnaXN0cmF0aW9uIGZhaWxlZFxuIiwKLQkJCXBkZXYtPmRldi5vZl9ub2Rl LT5mdWxsX25hbWUpOworCXByX2VycigiJXBPRjogR1BJTyBjaGlwIHJlZ2lzdHJhdGlvbiBmYWls ZWRcbiIsIHBkZXYtPmRldi5vZl9ub2RlKTsKIAlyZXR1cm4gcmV0OwogfTsKCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwaW8vZ3Bpby1ncmdwaW8uYyBiL2RyaXZlcnMvZ3Bpby9ncGlvLWdyZ3Bpby5j CmluZGV4IDc4NDdkZDM0Zjg2Zi4uNjU0NGExNmFiMDJlIDEwMDY0NAotLS0gYS9kcml2ZXJzL2dw aW8vZ3Bpby1ncmdwaW8uYworKysgYi9kcml2ZXJzL2dwaW8vZ3Bpby1ncmdwaW8uYwpAQCAtMzY3 LDcgKzM2Nyw3IEBAIHN0YXRpYyBpbnQgZ3JncGlvX3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZp Y2UgKm9mZGV2KQogCWdjLT5vZl9ub2RlID0gbnA7CiAJZ2MtPm93bmVyID0gVEhJU19NT0RVTEU7 CiAJZ2MtPnRvX2lycSA9IGdyZ3Bpb190b19pcnE7Ci0JZ2MtPmxhYmVsID0gbnAtPmZ1bGxfbmFt ZTsKKwlnYy0+bGFiZWwgPSBkZXZtX2thc3ByaW50Zigmb2ZkZXYtPmRldiwgR0ZQX0tFUk5FTCwg IiVwT0YiLCBucCk7CiAJZ2MtPmJhc2UgPSAtMTsKCiAJZXJyID0gb2ZfcHJvcGVydHlfcmVhZF91 MzIobnAsICJuYml0cyIsICZwcm9wKTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3Bpby9ncGlvLW1w Yzh4eHguYyBiL2RyaXZlcnMvZ3Bpby9ncGlvLW1wYzh4eHguYwppbmRleCA3OTM1MThhMzBhZmUu LjhjOTNkZWM0OThmYSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncGlvL2dwaW8tbXBjOHh4eC5jCisr KyBiL2RyaXZlcnMvZ3Bpby9ncGlvLW1wYzh4eHguYwpAQCAtMzQ4LDggKzM0OCw4IEBAIHN0YXRp YyBpbnQgbXBjOHh4eF9wcm9iZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQoKIAlyZXQg PSBncGlvY2hpcF9hZGRfZGF0YShnYywgbXBjOHh4eF9nYyk7CiAJaWYgKHJldCkgewotCQlwcl9l cnIoIiVzOiBHUElPIGNoaXAgcmVnaXN0cmF0aW9uIGZhaWxlZCB3aXRoIHN0YXR1cyAlZFxuIiwK LQkJICAgICAgIG5wLT5mdWxsX25hbWUsIHJldCk7CisJCXByX2VycigiJXBPRjogR1BJTyBjaGlw IHJlZ2lzdHJhdGlvbiBmYWlsZWQgd2l0aCBzdGF0dXMgJWRcbiIsCisJCSAgICAgICBucCwgcmV0 KTsKIAkJZ290byBlcnI7CiAJfQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3Bpby9ncGlvLXRiMTB4 LmMgYi9kcml2ZXJzL2dwaW8vZ3Bpby10YjEweC5jCmluZGV4IDgwYjY5NTlhZTk5NS4uMDkxZmZh YWVjNjM1IDEwMDY0NAotLS0gYS9kcml2ZXJzL2dwaW8vZ3Bpby10YjEweC5jCisrKyBiL2RyaXZl cnMvZ3Bpby9ncGlvLXRiMTB4LmMKQEAgLTE5MSw3ICsxOTEsOCBAQCBzdGF0aWMgaW50IHRiMTB4 X2dwaW9fcHJvYmUoc3RydWN0IHBsYXRmb3JtX2RldmljZSAqcGRldikKIAlpZiAoSVNfRVJSKHRi MTB4X2dwaW8tPmJhc2UpKQogCQlyZXR1cm4gUFRSX0VSUih0YjEweF9ncGlvLT5iYXNlKTsKCi0J dGIxMHhfZ3Bpby0+Z2MubGFiZWwJCT0gb2Zfbm9kZV9mdWxsX25hbWUoZG4pOworCXRiMTB4X2dw aW8tPmdjLmxhYmVsCQk9CisJCWRldm1fa2FzcHJpbnRmKCZwZGV2LT5kZXYsIEdGUF9LRVJORUws ICIlcE9GIiwgcGRldi0+ZGV2Lm9mX25vZGUpOwogCXRiMTB4X2dwaW8tPmdjLnBhcmVudAkJPSAm cGRldi0+ZGV2OwogCXRiMTB4X2dwaW8tPmdjLm93bmVyCQk9IFRISVNfTU9EVUxFOwogCXRiMTB4 X2dwaW8tPmdjLmRpcmVjdGlvbl9pbnB1dAk9IHRiMTB4X2dwaW9fZGlyZWN0aW9uX2luOwpkaWZm IC0tZ2l0IGEvZHJpdmVycy9ncGlvL2dwaW8tdHoxMDkwLmMgYi9kcml2ZXJzL2dwaW8vZ3Bpby10 ejEwOTAuYwppbmRleCBjYTk1OGUwZjY5MDkuLjIyYzViZTY1MDUxZiAxMDA2NDQKLS0tIGEvZHJp dmVycy9ncGlvL2dwaW8tdHoxMDkwLmMKKysrIGIvZHJpdmVycy9ncGlvL2dwaW8tdHoxMDkwLmMK QEAgLTUyNywxMyArNTI3LDEyIEBAIHN0YXRpYyB2b2lkIHR6MTA5MF9ncGlvX3JlZ2lzdGVyX2Jh bmtzKHN0cnVjdCB0ejEwOTBfZ3BpbyAqcHJpdikKCiAJCXJldCA9IG9mX3Byb3BlcnR5X3JlYWRf dTMyKG5vZGUsICJyZWciLCAmYWRkcik7CiAJCWlmIChyZXQpIHsKLQkJCWRldl9lcnIocHJpdi0+ ZGV2LCAiaW52YWxpZCByZWcgb24gJXNcbiIsCi0JCQkJbm9kZS0+ZnVsbF9uYW1lKTsKKwkJCWRl dl9lcnIocHJpdi0+ZGV2LCAiaW52YWxpZCByZWcgb24gJXBPRlxuIiwgbm9kZSk7CiAJCQljb250 aW51ZTsKIAkJfQogCQlpZiAoYWRkciA+PSAzKSB7Ci0JCQlkZXZfZXJyKHByaXYtPmRldiwgImlu ZGV4ICV1IGluICVzIG91dCBvZiByYW5nZVxuIiwKLQkJCQlhZGRyLCBub2RlLT5mdWxsX25hbWUp OworCQkJZGV2X2Vycihwcml2LT5kZXYsICJpbmRleCAldSBpbiAlcE9GIG91dCBvZiByYW5nZVxu IiwKKwkJCQlhZGRyLCBub2RlKTsKIAkJCWNvbnRpbnVlOwogCQl9CgpAQCAtNTQzLDggKzU0Miw3 IEBAIHN0YXRpYyB2b2lkIHR6MTA5MF9ncGlvX3JlZ2lzdGVyX2JhbmtzKHN0cnVjdCB0ejEwOTBf Z3BpbyAqcHJpdikKCiAJCXJldCA9IHR6MTA5MF9ncGlvX2JhbmtfcHJvYmUoJmluZm8pOwogCQlp ZiAocmV0KSB7Ci0JCQlkZXZfZXJyKHByaXYtPmRldiwgImZhaWx1cmUgcmVnaXN0ZXJpbmcgJXNc biIsCi0JCQkJbm9kZS0+ZnVsbF9uYW1lKTsKKwkJCWRldl9lcnIocHJpdi0+ZGV2LCAiZmFpbHVy ZSByZWdpc3RlcmluZyAlcE9GXG4iLCBub2RlKTsKIAkJCW9mX25vZGVfcHV0KG5vZGUpOwogCQkJ Y29udGludWU7CiAJCX0KZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3Bpby9ncGlvLXhpbGlueC5jIGIv ZHJpdmVycy9ncGlvL2dwaW8teGlsaW54LmMKaW5kZXggMTRiMmE2MjMzOGVhLi5lOGVjMGUzM2Ew YTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3Bpby9ncGlvLXhpbGlueC5jCisrKyBiL2RyaXZlcnMv Z3Bpby9ncGlvLXhpbGlueC5jCkBAIC0zNjAsOCArMzYwLDggQEAgc3RhdGljIGludCB4Z3Bpb19w cm9iZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQogCS8qIENhbGwgdGhlIE9GIGdwaW8g aGVscGVyIHRvIHNldHVwIGFuZCByZWdpc3RlciB0aGUgR1BJTyBkZXZpY2UgKi8KIAlzdGF0dXMg PSBvZl9tbV9ncGlvY2hpcF9hZGRfZGF0YShucCwgJmNoaXAtPm1tY2hpcCwgY2hpcCk7CiAJaWYg KHN0YXR1cykgewotCQlwcl9lcnIoIiVzOiBlcnJvciBpbiBwcm9iZSBmdW5jdGlvbiB3aXRoIHN0 YXR1cyAlZFxuIiwKLQkJICAgICAgIG5wLT5mdWxsX25hbWUsIHN0YXR1cyk7CisJCXByX2Vycigi JXBPRjogZXJyb3IgaW4gcHJvYmUgZnVuY3Rpb24gd2l0aCBzdGF0dXMgJWRcbiIsCisJCSAgICAg ICBucCwgc3RhdHVzKTsKIAkJcmV0dXJuIHN0YXR1czsKIAl9CgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncGlvL2dwaW9saWItb2YuYyBiL2RyaXZlcnMvZ3Bpby9ncGlvbGliLW9mLmMKaW5kZXggNTRj ZThkYzU4YWQwLi44Y2RlMDJlZDVmZDUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3Bpby9ncGlvbGli LW9mLmMKKysrIGIvZHJpdmVycy9ncGlvL2dwaW9saWItb2YuYwpAQCAtNzgsOCArNzgsOCBAQCBz dHJ1Y3QgZ3Bpb19kZXNjICpvZl9nZXRfbmFtZWRfZ3Bpb2RfZmxhZ3Moc3RydWN0IGRldmljZV9u b2RlICpucCwKIAlyZXQgPSBvZl9wYXJzZV9waGFuZGxlX3dpdGhfYXJncyhucCwgcHJvcG5hbWUs ICIjZ3Bpby1jZWxscyIsIGluZGV4LAogCQkJCQkgJmdwaW9zcGVjKTsKIAlpZiAocmV0KSB7Ci0J CXByX2RlYnVnKCIlczogY2FuJ3QgcGFyc2UgJyVzJyBwcm9wZXJ0eSBvZiBub2RlICclc1slZF0n XG4iLAotCQkJX19mdW5jX18sIHByb3BuYW1lLCBucC0+ZnVsbF9uYW1lLCBpbmRleCk7CisJCXBy X2RlYnVnKCIlczogY2FuJ3QgcGFyc2UgJyVzJyBwcm9wZXJ0eSBvZiBub2RlICclcE9GWyVkXSdc biIsCisJCQlfX2Z1bmNfXywgcHJvcG5hbWUsIG5wLCBpbmRleCk7CiAJCXJldHVybiBFUlJfUFRS KHJldCk7CiAJfQoKQEAgLTkzLDggKzkzLDggQEAgc3RydWN0IGdwaW9fZGVzYyAqb2ZfZ2V0X25h bWVkX2dwaW9kX2ZsYWdzKHN0cnVjdCBkZXZpY2Vfbm9kZSAqbnAsCiAJaWYgKElTX0VSUihkZXNj KSkKIAkJZ290byBvdXQ7CgotCXByX2RlYnVnKCIlczogcGFyc2VkICclcycgcHJvcGVydHkgb2Yg bm9kZSAnJXNbJWRdJyAtIHN0YXR1cyAoJWQpXG4iLAotCQkgX19mdW5jX18sIHByb3BuYW1lLCBu cC0+ZnVsbF9uYW1lLCBpbmRleCwKKwlwcl9kZWJ1ZygiJXM6IHBhcnNlZCAnJXMnIHByb3BlcnR5 IG9mIG5vZGUgJyVwT0ZbJWRdJyAtIHN0YXR1cyAoJWQpXG4iLAorCQkgX19mdW5jX18sIHByb3Bu YW1lLCBucCwgaW5kZXgsCiAJCSBQVFJfRVJSX09SX1pFUk8oZGVzYykpOwoKIG91dDoKQEAgLTMz Nyw3ICszMzcsNyBAQCBpbnQgb2ZfbW1fZ3Bpb2NoaXBfYWRkX2RhdGEoc3RydWN0IGRldmljZV9u b2RlICpucCwKIAlpbnQgcmV0ID0gLUVOT01FTTsKIAlzdHJ1Y3QgZ3Bpb19jaGlwICpnYyA9ICZt bV9nYy0+Z2M7CgotCWdjLT5sYWJlbCA9IGtzdHJkdXAobnAtPmZ1bGxfbmFtZSwgR0ZQX0tFUk5F TCk7CisJZ2MtPmxhYmVsID0ga2FzcHJpbnRmKEdGUF9LRVJORUwsICIlcE9GIiwgbnApOwogCWlm ICghZ2MtPmxhYmVsKQogCQlnb3RvIGVycjA7CgpAQCAtMzYyLDggKzM2Miw3IEBAIGludCBvZl9t bV9ncGlvY2hpcF9hZGRfZGF0YShzdHJ1Y3QgZGV2aWNlX25vZGUgKm5wLAogZXJyMToKIAlrZnJl ZShnYy0+bGFiZWwpOwogZXJyMDoKLQlwcl9lcnIoIiVzOiBHUElPIGNoaXAgcmVnaXN0cmF0aW9u IGZhaWxlZCB3aXRoIHN0YXR1cyAlZFxuIiwKLQkgICAgICAgbnAtPmZ1bGxfbmFtZSwgcmV0KTsK Kwlwcl9lcnIoIiVwT0Y6IEdQSU8gY2hpcCByZWdpc3RyYXRpb24gZmFpbGVkIHdpdGggc3RhdHVz ICVkXG4iLCBucCwgcmV0KTsKIAlyZXR1cm4gcmV0OwogfQogRVhQT1JUX1NZTUJPTChvZl9tbV9n cGlvY2hpcF9hZGRfZGF0YSk7CkBAIC00MTgsOCArNDE3LDggQEAgc3RhdGljIGludCBvZl9ncGlv Y2hpcF9hZGRfcGluX3JhbmdlKHN0cnVjdCBncGlvX2NoaXAgKmNoaXApCiAJCQkJCQlncm91cF9u YW1lc19wcm9wbmFtZSwKIAkJCQkJCWluZGV4LCAmbmFtZSk7CiAJCQkJaWYgKHN0cmxlbihuYW1l KSkgewotCQkJCQlwcl9lcnIoIiVzOiBHcm91cCBuYW1lIG9mIG51bWVyaWMgR1BJTyByYW5nZXMg bXVzdCBiZSB0aGUgZW1wdHkgc3RyaW5nLlxuIiwKLQkJCQkJCW5wLT5mdWxsX25hbWUpOworCQkJ CQlwcl9lcnIoIiVwT0Y6IEdyb3VwIG5hbWUgb2YgbnVtZXJpYyBHUElPIHJhbmdlcyBtdXN0IGJl IHRoZSBlbXB0eSBzdHJpbmcuXG4iLAorCQkJCQkJbnApOwogCQkJCQlicmVhazsKIAkJCQl9CiAJ CQl9CkBAIC00MzQsMTQgKzQzMywxNCBAQCBzdGF0aWMgaW50IG9mX2dwaW9jaGlwX2FkZF9waW5f cmFuZ2Uoc3RydWN0IGdwaW9fY2hpcCAqY2hpcCkKIAkJfSBlbHNlIHsKIAkJCS8qIG5waW5zID09 IDA6IHNwZWNpYWwgcmFuZ2UgKi8KIAkJCWlmIChwaW5zcGVjLmFyZ3NbMV0pIHsKLQkJCQlwcl9l cnIoIiVzOiBJbGxlZ2FsIGdwaW8tcmFuZ2UgZm9ybWF0LlxuIiwKLQkJCQkJbnAtPmZ1bGxfbmFt ZSk7CisJCQkJcHJfZXJyKCIlcE9GOiBJbGxlZ2FsIGdwaW8tcmFuZ2UgZm9ybWF0LlxuIiwKKwkJ CQkJbnApOwogCQkJCWJyZWFrOwogCQkJfQoKIAkJCWlmICghZ3JvdXBfbmFtZXMpIHsKLQkJCQlw cl9lcnIoIiVzOiBHUElPIGdyb3VwIHJhbmdlIHJlcXVlc3RlZCBidXQgbm8gJXMgcHJvcGVydHku XG4iLAotCQkJCQlucC0+ZnVsbF9uYW1lLCBncm91cF9uYW1lc19wcm9wbmFtZSk7CisJCQkJcHJf ZXJyKCIlcE9GOiBHUElPIGdyb3VwIHJhbmdlIHJlcXVlc3RlZCBidXQgbm8gJXMgcHJvcGVydHku XG4iLAorCQkJCQlucCwgZ3JvdXBfbmFtZXNfcHJvcG5hbWUpOwogCQkJCWJyZWFrOwogCQkJfQoK QEAgLTQ1Miw4ICs0NTEsOCBAQCBzdGF0aWMgaW50IG9mX2dwaW9jaGlwX2FkZF9waW5fcmFuZ2Uo c3RydWN0IGdwaW9fY2hpcCAqY2hpcCkKIAkJCQlicmVhazsKCiAJCQlpZiAoIXN0cmxlbihuYW1l KSkgewotCQkJCXByX2VycigiJXM6IEdyb3VwIG5hbWUgb2YgR1BJTyBncm91cCByYW5nZSBjYW5u b3QgYmUgdGhlIGVtcHR5IHN0cmluZy5cbiIsCi0JCQkJbnAtPmZ1bGxfbmFtZSk7CisJCQkJcHJf ZXJyKCIlcE9GOiBHcm91cCBuYW1lIG9mIEdQSU8gZ3JvdXAgcmFuZ2UgY2Fubm90IGJlIHRoZSBl bXB0eSBzdHJpbmcuXG4iLAorCQkJCW5wKTsKIAkJCQlicmVhazsKIAkJCX0KCmRpZmYgLS1naXQg YS9kcml2ZXJzL2dwaW8vZ3Bpb2xpYi5jIGIvZHJpdmVycy9ncGlvL2dwaW9saWIuYwppbmRleCA5 NTY4NzA4YTU1MGIuLjRkOTExYTVlZWEzZSAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncGlvL2dwaW9s aWIuYworKysgYi9kcml2ZXJzL2dwaW8vZ3Bpb2xpYi5jCkBAIC0xNzc1LDcgKzE3NzUsNyBAQCBp bnQgZ3Bpb2NoaXBfaXJxY2hpcF9hZGRfa2V5KHN0cnVjdCBncGlvX2NoaXAgKmdwaW9jaGlwLAog CSAqIGNvbmZsaWN0aW5nIHRyaWdnZXJzLiBUZWxsIHRoZSB1c2VyLCBhbmQgcmVzZXQgdG8gTk9O RS4KIAkgKi8KIAlpZiAoV0FSTihvZl9ub2RlICYmIHR5cGUgIT0gSVJRX1RZUEVfTk9ORSwKLQkJ ICIlczogSWdub3JpbmcgJWQgZGVmYXVsdCB0cmlnZ2VyXG4iLCBvZl9ub2RlLT5mdWxsX25hbWUs IHR5cGUpKQorCQkgIiVwT0Y6IElnbm9yaW5nICVkIGRlZmF1bHQgdHJpZ2dlclxuIiwgb2Zfbm9k ZSwgdHlwZSkpCiAJCXR5cGUgPSBJUlFfVFlQRV9OT05FOwogCWlmIChoYXNfYWNwaV9jb21wYW5p b24oZ3Bpb2NoaXAtPnBhcmVudCkgJiYgdHlwZSAhPSBJUlFfVFlQRV9OT05FKSB7CiAJCWFjcGlf aGFuZGxlX3dhcm4oQUNQSV9IQU5ETEUoZ3Bpb2NoaXAtPnBhcmVudCksCi0tCjIuMTEuMAoKCl9f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmxpbnV4LWFybS1r ZXJuZWwgbWFpbGluZyBsaXN0CmxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpo dHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LWFybS1rZXJu ZWwK From mboxrd@z Thu Jan 1 00:00:00 1970 From: robh@kernel.org (Rob Herring) Date: Tue, 18 Jul 2017 16:43:03 -0500 Subject: [PATCH] gpio: Convert to using %pOF instead of full_name Message-ID: <20170718214339.7774-23-robh@kernel.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Now that we have a custom printf format specifier, convert users of full_name to use %pOF instead. This is preparation to remove storing of the full path string for each node. Signed-off-by: Rob Herring Cc: Tien Hock Loh Cc: Linus Walleij Cc: Alexandre Courbot Cc: Gregory Fong Cc: Brian Norris Cc: Florian Fainelli Cc: bcm-kernel-feedback-list at broadcom.com Cc: Michal Simek Cc: "S?ren Brinkmann" Cc: linux-gpio at vger.kernel.org Cc: linux-arm-kernel at lists.infradead.org --- drivers/gpio/gpio-altera.c | 4 ++-- drivers/gpio/gpio-brcmstb.c | 2 +- drivers/gpio/gpio-ge.c | 6 ++---- drivers/gpio/gpio-grgpio.c | 2 +- drivers/gpio/gpio-mpc8xxx.c | 4 ++-- drivers/gpio/gpio-tb10x.c | 3 ++- drivers/gpio/gpio-tz1090.c | 10 ++++------ drivers/gpio/gpio-xilinx.c | 4 ++-- drivers/gpio/gpiolib-of.c | 29 ++++++++++++++--------------- drivers/gpio/gpiolib.c | 2 +- 10 files changed, 31 insertions(+), 35 deletions(-) diff --git a/drivers/gpio/gpio-altera.c b/drivers/gpio/gpio-altera.c index 17485dc20384..ccc02ed65b3c 100644 --- a/drivers/gpio/gpio-altera.c +++ b/drivers/gpio/gpio-altera.c @@ -324,8 +324,8 @@ static int altera_gpio_probe(struct platform_device *pdev) return 0; teardown: of_mm_gpiochip_remove(&altera_gc->mmchip); - pr_err("%s: registration failed with status %d\n", - node->full_name, ret); + pr_err("%pOF: registration failed with status %d\n", + node, ret); return ret; } diff --git a/drivers/gpio/gpio-brcmstb.c b/drivers/gpio/gpio-brcmstb.c index e6489143721a..73f2c3be4657 100644 --- a/drivers/gpio/gpio-brcmstb.c +++ b/drivers/gpio/gpio-brcmstb.c @@ -483,7 +483,7 @@ static int brcmstb_gpio_probe(struct platform_device *pdev) gc->of_node = np; gc->owner = THIS_MODULE; - gc->label = np->full_name; + gc->label = devm_kasprintf(dev, GFP_KERNEL, "%pOF", dev->of_node); gc->base = gpio_base; gc->of_gpio_n_cells = 2; gc->of_xlate = brcmstb_gpio_of_xlate; diff --git a/drivers/gpio/gpio-ge.c b/drivers/gpio/gpio-ge.c index 8650b2916f87..6f5a7fe9787d 100644 --- a/drivers/gpio/gpio-ge.c +++ b/drivers/gpio/gpio-ge.c @@ -76,8 +76,7 @@ static int __init gef_gpio_probe(struct platform_device *pdev) } /* Setup pointers to chip functions */ - gc->label = devm_kstrdup(&pdev->dev, pdev->dev.of_node->full_name, - GFP_KERNEL); + gc->label = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%pOF", pdev->dev.of_node); if (!gc->label) { ret = -ENOMEM; goto err0; @@ -96,8 +95,7 @@ static int __init gef_gpio_probe(struct platform_device *pdev) return 0; err0: iounmap(regs); - pr_err("%s: GPIO chip registration failed\n", - pdev->dev.of_node->full_name); + pr_err("%pOF: GPIO chip registration failed\n", pdev->dev.of_node); return ret; }; diff --git a/drivers/gpio/gpio-grgpio.c b/drivers/gpio/gpio-grgpio.c index 7847dd34f86f..6544a16ab02e 100644 --- a/drivers/gpio/gpio-grgpio.c +++ b/drivers/gpio/gpio-grgpio.c @@ -367,7 +367,7 @@ static int grgpio_probe(struct platform_device *ofdev) gc->of_node = np; gc->owner = THIS_MODULE; gc->to_irq = grgpio_to_irq; - gc->label = np->full_name; + gc->label = devm_kasprintf(&ofdev->dev, GFP_KERNEL, "%pOF", np); gc->base = -1; err = of_property_read_u32(np, "nbits", &prop); diff --git a/drivers/gpio/gpio-mpc8xxx.c b/drivers/gpio/gpio-mpc8xxx.c index 793518a30afe..8c93dec498fa 100644 --- a/drivers/gpio/gpio-mpc8xxx.c +++ b/drivers/gpio/gpio-mpc8xxx.c @@ -348,8 +348,8 @@ static int mpc8xxx_probe(struct platform_device *pdev) ret = gpiochip_add_data(gc, mpc8xxx_gc); if (ret) { - pr_err("%s: GPIO chip registration failed with status %d\n", - np->full_name, ret); + pr_err("%pOF: GPIO chip registration failed with status %d\n", + np, ret); goto err; } diff --git a/drivers/gpio/gpio-tb10x.c b/drivers/gpio/gpio-tb10x.c index 80b6959ae995..091ffaaec635 100644 --- a/drivers/gpio/gpio-tb10x.c +++ b/drivers/gpio/gpio-tb10x.c @@ -191,7 +191,8 @@ static int tb10x_gpio_probe(struct platform_device *pdev) if (IS_ERR(tb10x_gpio->base)) return PTR_ERR(tb10x_gpio->base); - tb10x_gpio->gc.label = of_node_full_name(dn); + tb10x_gpio->gc.label = + devm_kasprintf(&pdev->dev, GFP_KERNEL, "%pOF", pdev->dev.of_node); tb10x_gpio->gc.parent = &pdev->dev; tb10x_gpio->gc.owner = THIS_MODULE; tb10x_gpio->gc.direction_input = tb10x_gpio_direction_in; diff --git a/drivers/gpio/gpio-tz1090.c b/drivers/gpio/gpio-tz1090.c index ca958e0f6909..22c5be65051f 100644 --- a/drivers/gpio/gpio-tz1090.c +++ b/drivers/gpio/gpio-tz1090.c @@ -527,13 +527,12 @@ static void tz1090_gpio_register_banks(struct tz1090_gpio *priv) ret = of_property_read_u32(node, "reg", &addr); if (ret) { - dev_err(priv->dev, "invalid reg on %s\n", - node->full_name); + dev_err(priv->dev, "invalid reg on %pOF\n", node); continue; } if (addr >= 3) { - dev_err(priv->dev, "index %u in %s out of range\n", - addr, node->full_name); + dev_err(priv->dev, "index %u in %pOF out of range\n", + addr, node); continue; } @@ -543,8 +542,7 @@ static void tz1090_gpio_register_banks(struct tz1090_gpio *priv) ret = tz1090_gpio_bank_probe(&info); if (ret) { - dev_err(priv->dev, "failure registering %s\n", - node->full_name); + dev_err(priv->dev, "failure registering %pOF\n", node); of_node_put(node); continue; } diff --git a/drivers/gpio/gpio-xilinx.c b/drivers/gpio/gpio-xilinx.c index 14b2a62338ea..e8ec0e33a0a9 100644 --- a/drivers/gpio/gpio-xilinx.c +++ b/drivers/gpio/gpio-xilinx.c @@ -360,8 +360,8 @@ static int xgpio_probe(struct platform_device *pdev) /* Call the OF gpio helper to setup and register the GPIO device */ status = of_mm_gpiochip_add_data(np, &chip->mmchip, chip); if (status) { - pr_err("%s: error in probe function with status %d\n", - np->full_name, status); + pr_err("%pOF: error in probe function with status %d\n", + np, status); return status; } diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c index 54ce8dc58ad0..8cde02ed5fd5 100644 --- a/drivers/gpio/gpiolib-of.c +++ b/drivers/gpio/gpiolib-of.c @@ -78,8 +78,8 @@ struct gpio_desc *of_get_named_gpiod_flags(struct device_node *np, ret = of_parse_phandle_with_args(np, propname, "#gpio-cells", index, &gpiospec); if (ret) { - pr_debug("%s: can't parse '%s' property of node '%s[%d]'\n", - __func__, propname, np->full_name, index); + pr_debug("%s: can't parse '%s' property of node '%pOF[%d]'\n", + __func__, propname, np, index); return ERR_PTR(ret); } @@ -93,8 +93,8 @@ struct gpio_desc *of_get_named_gpiod_flags(struct device_node *np, if (IS_ERR(desc)) goto out; - pr_debug("%s: parsed '%s' property of node '%s[%d]' - status (%d)\n", - __func__, propname, np->full_name, index, + pr_debug("%s: parsed '%s' property of node '%pOF[%d]' - status (%d)\n", + __func__, propname, np, index, PTR_ERR_OR_ZERO(desc)); out: @@ -337,7 +337,7 @@ int of_mm_gpiochip_add_data(struct device_node *np, int ret = -ENOMEM; struct gpio_chip *gc = &mm_gc->gc; - gc->label = kstrdup(np->full_name, GFP_KERNEL); + gc->label = kasprintf(GFP_KERNEL, "%pOF", np); if (!gc->label) goto err0; @@ -362,8 +362,7 @@ int of_mm_gpiochip_add_data(struct device_node *np, err1: kfree(gc->label); err0: - pr_err("%s: GPIO chip registration failed with status %d\n", - np->full_name, ret); + pr_err("%pOF: GPIO chip registration failed with status %d\n", np, ret); return ret; } EXPORT_SYMBOL(of_mm_gpiochip_add_data); @@ -418,8 +417,8 @@ static int of_gpiochip_add_pin_range(struct gpio_chip *chip) group_names_propname, index, &name); if (strlen(name)) { - pr_err("%s: Group name of numeric GPIO ranges must be the empty string.\n", - np->full_name); + pr_err("%pOF: Group name of numeric GPIO ranges must be the empty string.\n", + np); break; } } @@ -434,14 +433,14 @@ static int of_gpiochip_add_pin_range(struct gpio_chip *chip) } else { /* npins == 0: special range */ if (pinspec.args[1]) { - pr_err("%s: Illegal gpio-range format.\n", - np->full_name); + pr_err("%pOF: Illegal gpio-range format.\n", + np); break; } if (!group_names) { - pr_err("%s: GPIO group range requested but no %s property.\n", - np->full_name, group_names_propname); + pr_err("%pOF: GPIO group range requested but no %s property.\n", + np, group_names_propname); break; } @@ -452,8 +451,8 @@ static int of_gpiochip_add_pin_range(struct gpio_chip *chip) break; if (!strlen(name)) { - pr_err("%s: Group name of GPIO group range cannot be the empty string.\n", - np->full_name); + pr_err("%pOF: Group name of GPIO group range cannot be the empty string.\n", + np); break; } diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 9568708a550b..4d911a5eea3e 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1775,7 +1775,7 @@ int gpiochip_irqchip_add_key(struct gpio_chip *gpiochip, * conflicting triggers. Tell the user, and reset to NONE. */ if (WARN(of_node && type != IRQ_TYPE_NONE, - "%s: Ignoring %d default trigger\n", of_node->full_name, type)) + "%pOF: Ignoring %d default trigger\n", of_node, type)) type = IRQ_TYPE_NONE; if (has_acpi_companion(gpiochip->parent) && type != IRQ_TYPE_NONE) { acpi_handle_warn(ACPI_HANDLE(gpiochip->parent), -- 2.11.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752886AbdGRV40 (ORCPT ); Tue, 18 Jul 2017 17:56:26 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:35051 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752544AbdGRVoT (ORCPT ); Tue, 18 Jul 2017 17:44:19 -0400 From: Rob Herring To: Linus Walleij Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Tien Hock Loh , Alexandre Courbot , Gregory Fong , Brian Norris , Florian Fainelli , bcm-kernel-feedback-list@broadcom.com, Michal Simek , =?UTF-8?q?S=C3=B6ren=20Brinkmann?= , linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH] gpio: Convert to using %pOF instead of full_name Date: Tue, 18 Jul 2017 16:43:03 -0500 Message-Id: <20170718214339.7774-23-robh@kernel.org> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that we have a custom printf format specifier, convert users of full_name to use %pOF instead. This is preparation to remove storing of the full path string for each node. Signed-off-by: Rob Herring Cc: Tien Hock Loh Cc: Linus Walleij Cc: Alexandre Courbot Cc: Gregory Fong Cc: Brian Norris Cc: Florian Fainelli Cc: bcm-kernel-feedback-list@broadcom.com Cc: Michal Simek Cc: "Sören Brinkmann" Cc: linux-gpio@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org --- drivers/gpio/gpio-altera.c | 4 ++-- drivers/gpio/gpio-brcmstb.c | 2 +- drivers/gpio/gpio-ge.c | 6 ++---- drivers/gpio/gpio-grgpio.c | 2 +- drivers/gpio/gpio-mpc8xxx.c | 4 ++-- drivers/gpio/gpio-tb10x.c | 3 ++- drivers/gpio/gpio-tz1090.c | 10 ++++------ drivers/gpio/gpio-xilinx.c | 4 ++-- drivers/gpio/gpiolib-of.c | 29 ++++++++++++++--------------- drivers/gpio/gpiolib.c | 2 +- 10 files changed, 31 insertions(+), 35 deletions(-) diff --git a/drivers/gpio/gpio-altera.c b/drivers/gpio/gpio-altera.c index 17485dc20384..ccc02ed65b3c 100644 --- a/drivers/gpio/gpio-altera.c +++ b/drivers/gpio/gpio-altera.c @@ -324,8 +324,8 @@ static int altera_gpio_probe(struct platform_device *pdev) return 0; teardown: of_mm_gpiochip_remove(&altera_gc->mmchip); - pr_err("%s: registration failed with status %d\n", - node->full_name, ret); + pr_err("%pOF: registration failed with status %d\n", + node, ret); return ret; } diff --git a/drivers/gpio/gpio-brcmstb.c b/drivers/gpio/gpio-brcmstb.c index e6489143721a..73f2c3be4657 100644 --- a/drivers/gpio/gpio-brcmstb.c +++ b/drivers/gpio/gpio-brcmstb.c @@ -483,7 +483,7 @@ static int brcmstb_gpio_probe(struct platform_device *pdev) gc->of_node = np; gc->owner = THIS_MODULE; - gc->label = np->full_name; + gc->label = devm_kasprintf(dev, GFP_KERNEL, "%pOF", dev->of_node); gc->base = gpio_base; gc->of_gpio_n_cells = 2; gc->of_xlate = brcmstb_gpio_of_xlate; diff --git a/drivers/gpio/gpio-ge.c b/drivers/gpio/gpio-ge.c index 8650b2916f87..6f5a7fe9787d 100644 --- a/drivers/gpio/gpio-ge.c +++ b/drivers/gpio/gpio-ge.c @@ -76,8 +76,7 @@ static int __init gef_gpio_probe(struct platform_device *pdev) } /* Setup pointers to chip functions */ - gc->label = devm_kstrdup(&pdev->dev, pdev->dev.of_node->full_name, - GFP_KERNEL); + gc->label = devm_kasprintf(&pdev->dev, GFP_KERNEL, "%pOF", pdev->dev.of_node); if (!gc->label) { ret = -ENOMEM; goto err0; @@ -96,8 +95,7 @@ static int __init gef_gpio_probe(struct platform_device *pdev) return 0; err0: iounmap(regs); - pr_err("%s: GPIO chip registration failed\n", - pdev->dev.of_node->full_name); + pr_err("%pOF: GPIO chip registration failed\n", pdev->dev.of_node); return ret; }; diff --git a/drivers/gpio/gpio-grgpio.c b/drivers/gpio/gpio-grgpio.c index 7847dd34f86f..6544a16ab02e 100644 --- a/drivers/gpio/gpio-grgpio.c +++ b/drivers/gpio/gpio-grgpio.c @@ -367,7 +367,7 @@ static int grgpio_probe(struct platform_device *ofdev) gc->of_node = np; gc->owner = THIS_MODULE; gc->to_irq = grgpio_to_irq; - gc->label = np->full_name; + gc->label = devm_kasprintf(&ofdev->dev, GFP_KERNEL, "%pOF", np); gc->base = -1; err = of_property_read_u32(np, "nbits", &prop); diff --git a/drivers/gpio/gpio-mpc8xxx.c b/drivers/gpio/gpio-mpc8xxx.c index 793518a30afe..8c93dec498fa 100644 --- a/drivers/gpio/gpio-mpc8xxx.c +++ b/drivers/gpio/gpio-mpc8xxx.c @@ -348,8 +348,8 @@ static int mpc8xxx_probe(struct platform_device *pdev) ret = gpiochip_add_data(gc, mpc8xxx_gc); if (ret) { - pr_err("%s: GPIO chip registration failed with status %d\n", - np->full_name, ret); + pr_err("%pOF: GPIO chip registration failed with status %d\n", + np, ret); goto err; } diff --git a/drivers/gpio/gpio-tb10x.c b/drivers/gpio/gpio-tb10x.c index 80b6959ae995..091ffaaec635 100644 --- a/drivers/gpio/gpio-tb10x.c +++ b/drivers/gpio/gpio-tb10x.c @@ -191,7 +191,8 @@ static int tb10x_gpio_probe(struct platform_device *pdev) if (IS_ERR(tb10x_gpio->base)) return PTR_ERR(tb10x_gpio->base); - tb10x_gpio->gc.label = of_node_full_name(dn); + tb10x_gpio->gc.label = + devm_kasprintf(&pdev->dev, GFP_KERNEL, "%pOF", pdev->dev.of_node); tb10x_gpio->gc.parent = &pdev->dev; tb10x_gpio->gc.owner = THIS_MODULE; tb10x_gpio->gc.direction_input = tb10x_gpio_direction_in; diff --git a/drivers/gpio/gpio-tz1090.c b/drivers/gpio/gpio-tz1090.c index ca958e0f6909..22c5be65051f 100644 --- a/drivers/gpio/gpio-tz1090.c +++ b/drivers/gpio/gpio-tz1090.c @@ -527,13 +527,12 @@ static void tz1090_gpio_register_banks(struct tz1090_gpio *priv) ret = of_property_read_u32(node, "reg", &addr); if (ret) { - dev_err(priv->dev, "invalid reg on %s\n", - node->full_name); + dev_err(priv->dev, "invalid reg on %pOF\n", node); continue; } if (addr >= 3) { - dev_err(priv->dev, "index %u in %s out of range\n", - addr, node->full_name); + dev_err(priv->dev, "index %u in %pOF out of range\n", + addr, node); continue; } @@ -543,8 +542,7 @@ static void tz1090_gpio_register_banks(struct tz1090_gpio *priv) ret = tz1090_gpio_bank_probe(&info); if (ret) { - dev_err(priv->dev, "failure registering %s\n", - node->full_name); + dev_err(priv->dev, "failure registering %pOF\n", node); of_node_put(node); continue; } diff --git a/drivers/gpio/gpio-xilinx.c b/drivers/gpio/gpio-xilinx.c index 14b2a62338ea..e8ec0e33a0a9 100644 --- a/drivers/gpio/gpio-xilinx.c +++ b/drivers/gpio/gpio-xilinx.c @@ -360,8 +360,8 @@ static int xgpio_probe(struct platform_device *pdev) /* Call the OF gpio helper to setup and register the GPIO device */ status = of_mm_gpiochip_add_data(np, &chip->mmchip, chip); if (status) { - pr_err("%s: error in probe function with status %d\n", - np->full_name, status); + pr_err("%pOF: error in probe function with status %d\n", + np, status); return status; } diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c index 54ce8dc58ad0..8cde02ed5fd5 100644 --- a/drivers/gpio/gpiolib-of.c +++ b/drivers/gpio/gpiolib-of.c @@ -78,8 +78,8 @@ struct gpio_desc *of_get_named_gpiod_flags(struct device_node *np, ret = of_parse_phandle_with_args(np, propname, "#gpio-cells", index, &gpiospec); if (ret) { - pr_debug("%s: can't parse '%s' property of node '%s[%d]'\n", - __func__, propname, np->full_name, index); + pr_debug("%s: can't parse '%s' property of node '%pOF[%d]'\n", + __func__, propname, np, index); return ERR_PTR(ret); } @@ -93,8 +93,8 @@ struct gpio_desc *of_get_named_gpiod_flags(struct device_node *np, if (IS_ERR(desc)) goto out; - pr_debug("%s: parsed '%s' property of node '%s[%d]' - status (%d)\n", - __func__, propname, np->full_name, index, + pr_debug("%s: parsed '%s' property of node '%pOF[%d]' - status (%d)\n", + __func__, propname, np, index, PTR_ERR_OR_ZERO(desc)); out: @@ -337,7 +337,7 @@ int of_mm_gpiochip_add_data(struct device_node *np, int ret = -ENOMEM; struct gpio_chip *gc = &mm_gc->gc; - gc->label = kstrdup(np->full_name, GFP_KERNEL); + gc->label = kasprintf(GFP_KERNEL, "%pOF", np); if (!gc->label) goto err0; @@ -362,8 +362,7 @@ int of_mm_gpiochip_add_data(struct device_node *np, err1: kfree(gc->label); err0: - pr_err("%s: GPIO chip registration failed with status %d\n", - np->full_name, ret); + pr_err("%pOF: GPIO chip registration failed with status %d\n", np, ret); return ret; } EXPORT_SYMBOL(of_mm_gpiochip_add_data); @@ -418,8 +417,8 @@ static int of_gpiochip_add_pin_range(struct gpio_chip *chip) group_names_propname, index, &name); if (strlen(name)) { - pr_err("%s: Group name of numeric GPIO ranges must be the empty string.\n", - np->full_name); + pr_err("%pOF: Group name of numeric GPIO ranges must be the empty string.\n", + np); break; } } @@ -434,14 +433,14 @@ static int of_gpiochip_add_pin_range(struct gpio_chip *chip) } else { /* npins == 0: special range */ if (pinspec.args[1]) { - pr_err("%s: Illegal gpio-range format.\n", - np->full_name); + pr_err("%pOF: Illegal gpio-range format.\n", + np); break; } if (!group_names) { - pr_err("%s: GPIO group range requested but no %s property.\n", - np->full_name, group_names_propname); + pr_err("%pOF: GPIO group range requested but no %s property.\n", + np, group_names_propname); break; } @@ -452,8 +451,8 @@ static int of_gpiochip_add_pin_range(struct gpio_chip *chip) break; if (!strlen(name)) { - pr_err("%s: Group name of GPIO group range cannot be the empty string.\n", - np->full_name); + pr_err("%pOF: Group name of GPIO group range cannot be the empty string.\n", + np); break; } diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 9568708a550b..4d911a5eea3e 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -1775,7 +1775,7 @@ int gpiochip_irqchip_add_key(struct gpio_chip *gpiochip, * conflicting triggers. Tell the user, and reset to NONE. */ if (WARN(of_node && type != IRQ_TYPE_NONE, - "%s: Ignoring %d default trigger\n", of_node->full_name, type)) + "%pOF: Ignoring %d default trigger\n", of_node, type)) type = IRQ_TYPE_NONE; if (has_acpi_companion(gpiochip->parent) && type != IRQ_TYPE_NONE) { acpi_handle_warn(ACPI_HANDLE(gpiochip->parent), -- 2.11.0