From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rob Herring Date: Tue, 28 Aug 2018 01:52:50 +0000 Subject: [PATCH] fbdev: Convert to using %pOFn instead of device_node.name Message-Id: <20180828015252.28511-49-robh@kernel.org> List-Id: References: <20180828015252.28511-1-robh@kernel.org> In-Reply-To: <20180828015252.28511-1-robh@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-kernel@vger.kernel.org Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, Bartlomiej Zolnierkiewicz In preparation to remove the node name pointer from struct device_node, convert printf users to use the %pOFn format specifier. Cc: Bartlomiej Zolnierkiewicz Cc: dri-devel@lists.freedesktop.org Cc: linux-fbdev@vger.kernel.org Signed-off-by: Rob Herring --- drivers/video/fbdev/cg14.c | 4 +--- drivers/video/fbdev/cg3.c | 2 +- drivers/video/fbdev/core/fbmon.c | 4 ++-- drivers/video/fbdev/imsttfb.c | 2 +- drivers/video/fbdev/leo.c | 2 +- drivers/video/fbdev/offb.c | 12 ++++++++---- drivers/video/fbdev/p9100.c | 2 +- drivers/video/of_display_timing.c | 2 +- 8 files changed, 16 insertions(+), 14 deletions(-) diff --git a/drivers/video/fbdev/cg14.c b/drivers/video/fbdev/cg14.c index 8de88b129b62..9af54c2368fd 100644 --- a/drivers/video/fbdev/cg14.c +++ b/drivers/video/fbdev/cg14.c @@ -355,9 +355,7 @@ static int cg14_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg) static void cg14_init_fix(struct fb_info *info, int linebytes, struct device_node *dp) { - const char *name = dp->name; - - strlcpy(info->fix.id, name, sizeof(info->fix.id)); + snprintf(info->fix.id, sizeof(info->fix.id), "%pOFn", dp); info->fix.type = FB_TYPE_PACKED_PIXELS; info->fix.visual = FB_VISUAL_PSEUDOCOLOR; diff --git a/drivers/video/fbdev/cg3.c b/drivers/video/fbdev/cg3.c index 6c334260cf53..1bd95b02f3aa 100644 --- a/drivers/video/fbdev/cg3.c +++ b/drivers/video/fbdev/cg3.c @@ -246,7 +246,7 @@ static int cg3_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg) static void cg3_init_fix(struct fb_info *info, int linebytes, struct device_node *dp) { - strlcpy(info->fix.id, dp->name, sizeof(info->fix.id)); + snprintf(info->fix.id, sizeof(info->fix.id), "%pOFn", dp); info->fix.type = FB_TYPE_PACKED_PIXELS; info->fix.visual = FB_VISUAL_PSEUDOCOLOR; diff --git a/drivers/video/fbdev/core/fbmon.c b/drivers/video/fbdev/core/fbmon.c index 852d86c1c527..dd3128990776 100644 --- a/drivers/video/fbdev/core/fbmon.c +++ b/drivers/video/fbdev/core/fbmon.c @@ -1480,8 +1480,8 @@ int of_get_fb_videomode(struct device_node *np, struct fb_videomode *fb, if (ret) return ret; - pr_debug("%pOF: got %dx%d display mode from %s\n", - np, vm.hactive, vm.vactive, np->name); + pr_debug("%pOF: got %dx%d display mode\n", + np, vm.hactive, vm.vactive); dump_fb_videomode(fb); return 0; diff --git a/drivers/video/fbdev/imsttfb.c b/drivers/video/fbdev/imsttfb.c index ecdcf358ad5e..901ca4ed10e9 100644 --- a/drivers/video/fbdev/imsttfb.c +++ b/drivers/video/fbdev/imsttfb.c @@ -1473,7 +1473,7 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) dp = pci_device_to_OF_node(pdev); if(dp) - printk(KERN_INFO "%s: OF name %s\n",__func__, dp->name); + printk(KERN_INFO "%s: OF name %pOFn\n",__func__, dp); else if (IS_ENABLED(CONFIG_OF)) printk(KERN_ERR "imsttfb: no OF node for pci device\n"); diff --git a/drivers/video/fbdev/leo.c b/drivers/video/fbdev/leo.c index 71862188f528..446ac3364bad 100644 --- a/drivers/video/fbdev/leo.c +++ b/drivers/video/fbdev/leo.c @@ -434,7 +434,7 @@ static int leo_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg) static void leo_init_fix(struct fb_info *info, struct device_node *dp) { - strlcpy(info->fix.id, dp->name, sizeof(info->fix.id)); + snprintf(info->fix.id, sizeof(info->fix.id), "%pOFn", dp); info->fix.type = FB_TYPE_PACKED_PIXELS; info->fix.visual = FB_VISUAL_TRUECOLOR; diff --git a/drivers/video/fbdev/offb.c b/drivers/video/fbdev/offb.c index 77c0a2f45b3b..31f769d67195 100644 --- a/drivers/video/fbdev/offb.c +++ b/drivers/video/fbdev/offb.c @@ -419,9 +419,13 @@ static void __init offb_init_fb(const char *name, var = &info->var; info->par = par; - strcpy(fix->id, "OFfb "); - strncat(fix->id, name, sizeof(fix->id) - sizeof("OFfb ")); - fix->id[sizeof(fix->id) - 1] = '\0'; + if (name) { + strcpy(fix->id, "OFfb "); + strncat(fix->id, name, sizeof(fix->id) - sizeof("OFfb ")); + fix->id[sizeof(fix->id) - 1] = '\0'; + } else + snprintf(fix->id, sizeof(fix->id), "OFfb %pOFn", dp); + var->xres = var->xres_virtual = width; var->yres = var->yres_virtual = height; @@ -644,7 +648,7 @@ static void __init offb_init_nodriver(struct device_node *dp, int no_real_node) /* kludge for valkyrie */ if (strcmp(dp->name, "valkyrie") = 0) address += 0x1000; - offb_init_fb(no_real_node ? "bootx" : dp->name, + offb_init_fb(no_real_node ? "bootx" : NULL, width, height, depth, pitch, address, foreign_endian, no_real_node ? NULL : dp); } diff --git a/drivers/video/fbdev/p9100.c b/drivers/video/fbdev/p9100.c index 64de5cda541d..c4283e9e95af 100644 --- a/drivers/video/fbdev/p9100.c +++ b/drivers/video/fbdev/p9100.c @@ -239,7 +239,7 @@ static int p9100_ioctl(struct fb_info *info, unsigned int cmd, static void p9100_init_fix(struct fb_info *info, int linebytes, struct device_node *dp) { - strlcpy(info->fix.id, dp->name, sizeof(info->fix.id)); + snprintf(info->fix.id, sizeof(info->fix.id), "%pOFn", dp); info->fix.type = FB_TYPE_PACKED_PIXELS; info->fix.visual = FB_VISUAL_PSEUDOCOLOR; diff --git a/drivers/video/of_display_timing.c b/drivers/video/of_display_timing.c index 5244e93ceafc..c2e7aa103fa5 100644 --- a/drivers/video/of_display_timing.c +++ b/drivers/video/of_display_timing.c @@ -170,7 +170,7 @@ struct display_timings *of_get_display_timings(const struct device_node *np) goto entryfail; } - pr_debug("%pOF: using %s as default timing\n", np, entry->name); + pr_debug("%pOF: using %pOFn as default timing\n", np, entry); native_mode = entry; -- 2.17.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rob Herring Subject: [PATCH] fbdev: Convert to using %pOFn instead of device_node.name Date: Mon, 27 Aug 2018 20:52:50 -0500 Message-ID: <20180828015252.28511-49-robh@kernel.org> References: <20180828015252.28511-1-robh@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-oi0-f65.google.com (mail-oi0-f65.google.com [209.85.218.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 669A86E2D2 for ; Tue, 28 Aug 2018 01:55:18 +0000 (UTC) Received: by mail-oi0-f65.google.com with SMTP id c190-v6so16056oig.6 for ; Mon, 27 Aug 2018 18:55:18 -0700 (PDT) In-Reply-To: <20180828015252.28511-1-robh@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, Bartlomiej Zolnierkiewicz List-Id: dri-devel@lists.freedesktop.org SW4gcHJlcGFyYXRpb24gdG8gcmVtb3ZlIHRoZSBub2RlIG5hbWUgcG9pbnRlciBmcm9tIHN0cnVj dCBkZXZpY2Vfbm9kZSwKY29udmVydCBwcmludGYgdXNlcnMgdG8gdXNlIHRoZSAlcE9GbiBmb3Jt YXQgc3BlY2lmaWVyLgoKQ2M6IEJhcnRsb21pZWogWm9sbmllcmtpZXdpY3ogPGIuem9sbmllcmtp ZUBzYW1zdW5nLmNvbT4KQ2M6IGRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKQ2M6IGxp bnV4LWZiZGV2QHZnZXIua2VybmVsLm9yZwpTaWduZWQtb2ZmLWJ5OiBSb2IgSGVycmluZyA8cm9i aEBrZXJuZWwub3JnPgotLS0KIGRyaXZlcnMvdmlkZW8vZmJkZXYvY2cxNC5jICAgICAgICB8ICA0 ICstLS0KIGRyaXZlcnMvdmlkZW8vZmJkZXYvY2czLmMgICAgICAgICB8ICAyICstCiBkcml2ZXJz L3ZpZGVvL2ZiZGV2L2NvcmUvZmJtb24uYyAgfCAgNCArKy0tCiBkcml2ZXJzL3ZpZGVvL2ZiZGV2 L2ltc3R0ZmIuYyAgICAgfCAgMiArLQogZHJpdmVycy92aWRlby9mYmRldi9sZW8uYyAgICAgICAg IHwgIDIgKy0KIGRyaXZlcnMvdmlkZW8vZmJkZXYvb2ZmYi5jICAgICAgICB8IDEyICsrKysrKysr LS0tLQogZHJpdmVycy92aWRlby9mYmRldi9wOTEwMC5jICAgICAgIHwgIDIgKy0KIGRyaXZlcnMv dmlkZW8vb2ZfZGlzcGxheV90aW1pbmcuYyB8ICAyICstCiA4IGZpbGVzIGNoYW5nZWQsIDE2IGlu c2VydGlvbnMoKyksIDE0IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvdmlkZW8v ZmJkZXYvY2cxNC5jIGIvZHJpdmVycy92aWRlby9mYmRldi9jZzE0LmMKaW5kZXggOGRlODhiMTI5 YjYyLi45YWY1NGMyMzY4ZmQgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvdmlkZW8vZmJkZXYvY2cxNC5j CisrKyBiL2RyaXZlcnMvdmlkZW8vZmJkZXYvY2cxNC5jCkBAIC0zNTUsOSArMzU1LDcgQEAgc3Rh dGljIGludCBjZzE0X2lvY3RsKHN0cnVjdCBmYl9pbmZvICppbmZvLCB1bnNpZ25lZCBpbnQgY21k LCB1bnNpZ25lZCBsb25nIGFyZykKIHN0YXRpYyB2b2lkIGNnMTRfaW5pdF9maXgoc3RydWN0IGZi X2luZm8gKmluZm8sIGludCBsaW5lYnl0ZXMsCiAJCQkgIHN0cnVjdCBkZXZpY2Vfbm9kZSAqZHAp CiB7Ci0JY29uc3QgY2hhciAqbmFtZSA9IGRwLT5uYW1lOwotCi0Jc3RybGNweShpbmZvLT5maXgu aWQsIG5hbWUsIHNpemVvZihpbmZvLT5maXguaWQpKTsKKwlzbnByaW50ZihpbmZvLT5maXguaWQs IHNpemVvZihpbmZvLT5maXguaWQpLCAiJXBPRm4iLCBkcCk7CiAKIAlpbmZvLT5maXgudHlwZSA9 IEZCX1RZUEVfUEFDS0VEX1BJWEVMUzsKIAlpbmZvLT5maXgudmlzdWFsID0gRkJfVklTVUFMX1BT RVVET0NPTE9SOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy92aWRlby9mYmRldi9jZzMuYyBiL2RyaXZl cnMvdmlkZW8vZmJkZXYvY2czLmMKaW5kZXggNmMzMzQyNjBjZjUzLi4xYmQ5NWIwMmYzYWEgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvdmlkZW8vZmJkZXYvY2czLmMKKysrIGIvZHJpdmVycy92aWRlby9m YmRldi9jZzMuYwpAQCAtMjQ2LDcgKzI0Niw3IEBAIHN0YXRpYyBpbnQgY2czX2lvY3RsKHN0cnVj dCBmYl9pbmZvICppbmZvLCB1bnNpZ25lZCBpbnQgY21kLCB1bnNpZ25lZCBsb25nIGFyZykKIHN0 YXRpYyB2b2lkIGNnM19pbml0X2ZpeChzdHJ1Y3QgZmJfaW5mbyAqaW5mbywgaW50IGxpbmVieXRl cywKIAkJCSBzdHJ1Y3QgZGV2aWNlX25vZGUgKmRwKQogewotCXN0cmxjcHkoaW5mby0+Zml4Lmlk LCBkcC0+bmFtZSwgc2l6ZW9mKGluZm8tPmZpeC5pZCkpOworCXNucHJpbnRmKGluZm8tPmZpeC5p ZCwgc2l6ZW9mKGluZm8tPmZpeC5pZCksICIlcE9GbiIsIGRwKTsKIAogCWluZm8tPmZpeC50eXBl ID0gRkJfVFlQRV9QQUNLRURfUElYRUxTOwogCWluZm8tPmZpeC52aXN1YWwgPSBGQl9WSVNVQUxf UFNFVURPQ09MT1I7CmRpZmYgLS1naXQgYS9kcml2ZXJzL3ZpZGVvL2ZiZGV2L2NvcmUvZmJtb24u YyBiL2RyaXZlcnMvdmlkZW8vZmJkZXYvY29yZS9mYm1vbi5jCmluZGV4IDg1MmQ4NmMxYzUyNy4u ZGQzMTI4OTkwNzc2IDEwMDY0NAotLS0gYS9kcml2ZXJzL3ZpZGVvL2ZiZGV2L2NvcmUvZmJtb24u YworKysgYi9kcml2ZXJzL3ZpZGVvL2ZiZGV2L2NvcmUvZmJtb24uYwpAQCAtMTQ4MCw4ICsxNDgw LDggQEAgaW50IG9mX2dldF9mYl92aWRlb21vZGUoc3RydWN0IGRldmljZV9ub2RlICpucCwgc3Ry dWN0IGZiX3ZpZGVvbW9kZSAqZmIsCiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKIAotCXByX2Rl YnVnKCIlcE9GOiBnb3QgJWR4JWQgZGlzcGxheSBtb2RlIGZyb20gJXNcbiIsCi0JCW5wLCB2bS5o YWN0aXZlLCB2bS52YWN0aXZlLCBucC0+bmFtZSk7CisJcHJfZGVidWcoIiVwT0Y6IGdvdCAlZHgl ZCBkaXNwbGF5IG1vZGVcbiIsCisJCW5wLCB2bS5oYWN0aXZlLCB2bS52YWN0aXZlKTsKIAlkdW1w X2ZiX3ZpZGVvbW9kZShmYik7CiAKIAlyZXR1cm4gMDsKZGlmZiAtLWdpdCBhL2RyaXZlcnMvdmlk ZW8vZmJkZXYvaW1zdHRmYi5jIGIvZHJpdmVycy92aWRlby9mYmRldi9pbXN0dGZiLmMKaW5kZXgg ZWNkY2YzNThhZDVlLi45MDFjYTRlZDEwZTkgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvdmlkZW8vZmJk ZXYvaW1zdHRmYi5jCisrKyBiL2RyaXZlcnMvdmlkZW8vZmJkZXYvaW1zdHRmYi5jCkBAIC0xNDcz LDcgKzE0NzMsNyBAQCBzdGF0aWMgaW50IGltc3R0ZmJfcHJvYmUoc3RydWN0IHBjaV9kZXYgKnBk ZXYsIGNvbnN0IHN0cnVjdCBwY2lfZGV2aWNlX2lkICplbnQpCiAJCiAJZHAgPSBwY2lfZGV2aWNl X3RvX09GX25vZGUocGRldik7CiAJaWYoZHApCi0JCXByaW50ayhLRVJOX0lORk8gIiVzOiBPRiBu YW1lICVzXG4iLF9fZnVuY19fLCBkcC0+bmFtZSk7CisJCXByaW50ayhLRVJOX0lORk8gIiVzOiBP RiBuYW1lICVwT0ZuXG4iLF9fZnVuY19fLCBkcCk7CiAJZWxzZSBpZiAoSVNfRU5BQkxFRChDT05G SUdfT0YpKQogCQlwcmludGsoS0VSTl9FUlIgImltc3R0ZmI6IG5vIE9GIG5vZGUgZm9yIHBjaSBk ZXZpY2VcbiIpOwogCmRpZmYgLS1naXQgYS9kcml2ZXJzL3ZpZGVvL2ZiZGV2L2xlby5jIGIvZHJp dmVycy92aWRlby9mYmRldi9sZW8uYwppbmRleCA3MTg2MjE4OGY1MjguLjQ0NmFjMzM2NGJhZCAx MDA2NDQKLS0tIGEvZHJpdmVycy92aWRlby9mYmRldi9sZW8uYworKysgYi9kcml2ZXJzL3ZpZGVv L2ZiZGV2L2xlby5jCkBAIC00MzQsNyArNDM0LDcgQEAgc3RhdGljIGludCBsZW9faW9jdGwoc3Ry dWN0IGZiX2luZm8gKmluZm8sIHVuc2lnbmVkIGludCBjbWQsIHVuc2lnbmVkIGxvbmcgYXJnKQog c3RhdGljIHZvaWQKIGxlb19pbml0X2ZpeChzdHJ1Y3QgZmJfaW5mbyAqaW5mbywgc3RydWN0IGRl dmljZV9ub2RlICpkcCkKIHsKLQlzdHJsY3B5KGluZm8tPmZpeC5pZCwgZHAtPm5hbWUsIHNpemVv ZihpbmZvLT5maXguaWQpKTsKKwlzbnByaW50ZihpbmZvLT5maXguaWQsIHNpemVvZihpbmZvLT5m aXguaWQpLCAiJXBPRm4iLCBkcCk7CiAKIAlpbmZvLT5maXgudHlwZSA9IEZCX1RZUEVfUEFDS0VE X1BJWEVMUzsKIAlpbmZvLT5maXgudmlzdWFsID0gRkJfVklTVUFMX1RSVUVDT0xPUjsKZGlmZiAt LWdpdCBhL2RyaXZlcnMvdmlkZW8vZmJkZXYvb2ZmYi5jIGIvZHJpdmVycy92aWRlby9mYmRldi9v ZmZiLmMKaW5kZXggNzdjMGEyZjQ1YjNiLi4zMWY3NjlkNjcxOTUgMTAwNjQ0Ci0tLSBhL2RyaXZl cnMvdmlkZW8vZmJkZXYvb2ZmYi5jCisrKyBiL2RyaXZlcnMvdmlkZW8vZmJkZXYvb2ZmYi5jCkBA IC00MTksOSArNDE5LDEzIEBAIHN0YXRpYyB2b2lkIF9faW5pdCBvZmZiX2luaXRfZmIoY29uc3Qg Y2hhciAqbmFtZSwKIAl2YXIgPSAmaW5mby0+dmFyOwogCWluZm8tPnBhciA9IHBhcjsKIAotCXN0 cmNweShmaXgtPmlkLCAiT0ZmYiAiKTsKLQlzdHJuY2F0KGZpeC0+aWQsIG5hbWUsIHNpemVvZihm aXgtPmlkKSAtIHNpemVvZigiT0ZmYiAiKSk7Ci0JZml4LT5pZFtzaXplb2YoZml4LT5pZCkgLSAx XSA9ICdcMCc7CisJaWYgKG5hbWUpIHsKKwkJc3RyY3B5KGZpeC0+aWQsICJPRmZiICIpOworCQlz dHJuY2F0KGZpeC0+aWQsIG5hbWUsIHNpemVvZihmaXgtPmlkKSAtIHNpemVvZigiT0ZmYiAiKSk7 CisJCWZpeC0+aWRbc2l6ZW9mKGZpeC0+aWQpIC0gMV0gPSAnXDAnOworCX0gZWxzZQorCQlzbnBy aW50ZihmaXgtPmlkLCBzaXplb2YoZml4LT5pZCksICJPRmZiICVwT0ZuIiwgZHApOworCiAKIAl2 YXItPnhyZXMgPSB2YXItPnhyZXNfdmlydHVhbCA9IHdpZHRoOwogCXZhci0+eXJlcyA9IHZhci0+ eXJlc192aXJ0dWFsID0gaGVpZ2h0OwpAQCAtNjQ0LDcgKzY0OCw3IEBAIHN0YXRpYyB2b2lkIF9f aW5pdCBvZmZiX2luaXRfbm9kcml2ZXIoc3RydWN0IGRldmljZV9ub2RlICpkcCwgaW50IG5vX3Jl YWxfbm9kZSkKIAkJLyoga2x1ZGdlIGZvciB2YWxreXJpZSAqLwogCQlpZiAoc3RyY21wKGRwLT5u YW1lLCAidmFsa3lyaWUiKSA9PSAwKQogCQkJYWRkcmVzcyArPSAweDEwMDA7Ci0JCW9mZmJfaW5p dF9mYihub19yZWFsX25vZGUgPyAiYm9vdHgiIDogZHAtPm5hbWUsCisJCW9mZmJfaW5pdF9mYihu b19yZWFsX25vZGUgPyAiYm9vdHgiIDogTlVMTCwKIAkJCSAgICAgd2lkdGgsIGhlaWdodCwgZGVw dGgsIHBpdGNoLCBhZGRyZXNzLAogCQkJICAgICBmb3JlaWduX2VuZGlhbiwgbm9fcmVhbF9ub2Rl ID8gTlVMTCA6IGRwKTsKIAl9CmRpZmYgLS1naXQgYS9kcml2ZXJzL3ZpZGVvL2ZiZGV2L3A5MTAw LmMgYi9kcml2ZXJzL3ZpZGVvL2ZiZGV2L3A5MTAwLmMKaW5kZXggNjRkZTVjZGE1NDFkLi5jNDI4 M2U5ZTk1YWYgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvdmlkZW8vZmJkZXYvcDkxMDAuYworKysgYi9k cml2ZXJzL3ZpZGVvL2ZiZGV2L3A5MTAwLmMKQEAgLTIzOSw3ICsyMzksNyBAQCBzdGF0aWMgaW50 IHA5MTAwX2lvY3RsKHN0cnVjdCBmYl9pbmZvICppbmZvLCB1bnNpZ25lZCBpbnQgY21kLAogCiBz dGF0aWMgdm9pZCBwOTEwMF9pbml0X2ZpeChzdHJ1Y3QgZmJfaW5mbyAqaW5mbywgaW50IGxpbmVi eXRlcywgc3RydWN0IGRldmljZV9ub2RlICpkcCkKIHsKLQlzdHJsY3B5KGluZm8tPmZpeC5pZCwg ZHAtPm5hbWUsIHNpemVvZihpbmZvLT5maXguaWQpKTsKKwlzbnByaW50ZihpbmZvLT5maXguaWQs IHNpemVvZihpbmZvLT5maXguaWQpLCAiJXBPRm4iLCBkcCk7CiAKIAlpbmZvLT5maXgudHlwZSA9 IEZCX1RZUEVfUEFDS0VEX1BJWEVMUzsKIAlpbmZvLT5maXgudmlzdWFsID0gRkJfVklTVUFMX1BT RVVET0NPTE9SOwpkaWZmIC0tZ2l0IGEvZHJpdmVycy92aWRlby9vZl9kaXNwbGF5X3RpbWluZy5j IGIvZHJpdmVycy92aWRlby9vZl9kaXNwbGF5X3RpbWluZy5jCmluZGV4IDUyNDRlOTNjZWFmYy4u YzJlN2FhMTAzZmE1IDEwMDY0NAotLS0gYS9kcml2ZXJzL3ZpZGVvL29mX2Rpc3BsYXlfdGltaW5n LmMKKysrIGIvZHJpdmVycy92aWRlby9vZl9kaXNwbGF5X3RpbWluZy5jCkBAIC0xNzAsNyArMTcw LDcgQEAgc3RydWN0IGRpc3BsYXlfdGltaW5ncyAqb2ZfZ2V0X2Rpc3BsYXlfdGltaW5ncyhjb25z dCBzdHJ1Y3QgZGV2aWNlX25vZGUgKm5wKQogCQlnb3RvIGVudHJ5ZmFpbDsKIAl9CiAKLQlwcl9k ZWJ1ZygiJXBPRjogdXNpbmcgJXMgYXMgZGVmYXVsdCB0aW1pbmdcbiIsIG5wLCBlbnRyeS0+bmFt ZSk7CisJcHJfZGVidWcoIiVwT0Y6IHVzaW5nICVwT0ZuIGFzIGRlZmF1bHQgdGltaW5nXG4iLCBu cCwgZW50cnkpOwogCiAJbmF0aXZlX21vZGUgPSBlbnRyeTsKIAotLSAKMi4xNy4xCgpfX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGlu ZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVl ZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK 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=-3.0 required=3.0 tests=MAILING_LIST_MULTI,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 03E46C433F5 for ; Tue, 28 Aug 2018 01:55:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AEC0720658 for ; Tue, 28 Aug 2018 01:55:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AEC0720658 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728195AbeH1Foe (ORCPT ); Tue, 28 Aug 2018 01:44:34 -0400 Received: from mail-oi0-f66.google.com ([209.85.218.66]:42940 "EHLO mail-oi0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727477AbeH1Foe (ORCPT ); Tue, 28 Aug 2018 01:44:34 -0400 Received: by mail-oi0-f66.google.com with SMTP id q204-v6so1732066oig.9; Mon, 27 Aug 2018 18:55:18 -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=6GXlxyXUgbelAbEjAaxb7b0y+0sJFbxQbtsrd2YVPQo=; b=F+rCwfz5TSn9mtufs5U1dBkJFTRe6WpJMDJGxuQafNSxRtRTrIlRnctZrJL1GBWH3z yfUbXu1Lj9FoXV/9oxFiKVLjozgJ/Aj6/EF5g1CJo1tZPuC3e8SIofj+Rq6xU/MNEsIA IPinpfwJj3XeGXfjJmZCuZn6zjHOs/wgC4X1x3pkmhNPbMcbYaEQS9dlaHZ28IUiOO4A Rf/pLuS0GTGDIIRRUrnjU9unvkoRZz5onmjAyxMLDrLp/BYtcvLVhoJj4NoB1cBbjQGI MI04/YjOWG9Rd9rZ0p2z50ft7iDBJeiJSBf5drjIz89ezTlKxHgshb4KtNCc4DlRyCX9 46QQ== X-Gm-Message-State: APzg51DgJ4+NI23hAnK1TvkBZ5NTYQrOC1SZ9N8PXjnqNO+wEGK2NyXv zAhQ2R3HIAnll4IFHkP+z8aixeE= X-Google-Smtp-Source: ANB0VdYCjsnn0IqrgiTFRl0JDsQ5KBci5/1/iNOHRsMUYYJx91K98t+Q0LJOLgz6zS9SaJivYFpG7g== X-Received: by 2002:aca:3507:: with SMTP id c7-v6mr1204742oia.46.1535421317711; Mon, 27 Aug 2018 18:55:17 -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.55.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Aug 2018 18:55:17 -0700 (PDT) From: Rob Herring To: linux-kernel@vger.kernel.org Cc: Bartlomiej Zolnierkiewicz , dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org Subject: [PATCH] fbdev: Convert to using %pOFn instead of device_node.name Date: Mon, 27 Aug 2018 20:52:50 -0500 Message-Id: <20180828015252.28511-49-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: Bartlomiej Zolnierkiewicz Cc: dri-devel@lists.freedesktop.org Cc: linux-fbdev@vger.kernel.org Signed-off-by: Rob Herring --- drivers/video/fbdev/cg14.c | 4 +--- drivers/video/fbdev/cg3.c | 2 +- drivers/video/fbdev/core/fbmon.c | 4 ++-- drivers/video/fbdev/imsttfb.c | 2 +- drivers/video/fbdev/leo.c | 2 +- drivers/video/fbdev/offb.c | 12 ++++++++---- drivers/video/fbdev/p9100.c | 2 +- drivers/video/of_display_timing.c | 2 +- 8 files changed, 16 insertions(+), 14 deletions(-) diff --git a/drivers/video/fbdev/cg14.c b/drivers/video/fbdev/cg14.c index 8de88b129b62..9af54c2368fd 100644 --- a/drivers/video/fbdev/cg14.c +++ b/drivers/video/fbdev/cg14.c @@ -355,9 +355,7 @@ static int cg14_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg) static void cg14_init_fix(struct fb_info *info, int linebytes, struct device_node *dp) { - const char *name = dp->name; - - strlcpy(info->fix.id, name, sizeof(info->fix.id)); + snprintf(info->fix.id, sizeof(info->fix.id), "%pOFn", dp); info->fix.type = FB_TYPE_PACKED_PIXELS; info->fix.visual = FB_VISUAL_PSEUDOCOLOR; diff --git a/drivers/video/fbdev/cg3.c b/drivers/video/fbdev/cg3.c index 6c334260cf53..1bd95b02f3aa 100644 --- a/drivers/video/fbdev/cg3.c +++ b/drivers/video/fbdev/cg3.c @@ -246,7 +246,7 @@ static int cg3_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg) static void cg3_init_fix(struct fb_info *info, int linebytes, struct device_node *dp) { - strlcpy(info->fix.id, dp->name, sizeof(info->fix.id)); + snprintf(info->fix.id, sizeof(info->fix.id), "%pOFn", dp); info->fix.type = FB_TYPE_PACKED_PIXELS; info->fix.visual = FB_VISUAL_PSEUDOCOLOR; diff --git a/drivers/video/fbdev/core/fbmon.c b/drivers/video/fbdev/core/fbmon.c index 852d86c1c527..dd3128990776 100644 --- a/drivers/video/fbdev/core/fbmon.c +++ b/drivers/video/fbdev/core/fbmon.c @@ -1480,8 +1480,8 @@ int of_get_fb_videomode(struct device_node *np, struct fb_videomode *fb, if (ret) return ret; - pr_debug("%pOF: got %dx%d display mode from %s\n", - np, vm.hactive, vm.vactive, np->name); + pr_debug("%pOF: got %dx%d display mode\n", + np, vm.hactive, vm.vactive); dump_fb_videomode(fb); return 0; diff --git a/drivers/video/fbdev/imsttfb.c b/drivers/video/fbdev/imsttfb.c index ecdcf358ad5e..901ca4ed10e9 100644 --- a/drivers/video/fbdev/imsttfb.c +++ b/drivers/video/fbdev/imsttfb.c @@ -1473,7 +1473,7 @@ static int imsttfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) dp = pci_device_to_OF_node(pdev); if(dp) - printk(KERN_INFO "%s: OF name %s\n",__func__, dp->name); + printk(KERN_INFO "%s: OF name %pOFn\n",__func__, dp); else if (IS_ENABLED(CONFIG_OF)) printk(KERN_ERR "imsttfb: no OF node for pci device\n"); diff --git a/drivers/video/fbdev/leo.c b/drivers/video/fbdev/leo.c index 71862188f528..446ac3364bad 100644 --- a/drivers/video/fbdev/leo.c +++ b/drivers/video/fbdev/leo.c @@ -434,7 +434,7 @@ static int leo_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg) static void leo_init_fix(struct fb_info *info, struct device_node *dp) { - strlcpy(info->fix.id, dp->name, sizeof(info->fix.id)); + snprintf(info->fix.id, sizeof(info->fix.id), "%pOFn", dp); info->fix.type = FB_TYPE_PACKED_PIXELS; info->fix.visual = FB_VISUAL_TRUECOLOR; diff --git a/drivers/video/fbdev/offb.c b/drivers/video/fbdev/offb.c index 77c0a2f45b3b..31f769d67195 100644 --- a/drivers/video/fbdev/offb.c +++ b/drivers/video/fbdev/offb.c @@ -419,9 +419,13 @@ static void __init offb_init_fb(const char *name, var = &info->var; info->par = par; - strcpy(fix->id, "OFfb "); - strncat(fix->id, name, sizeof(fix->id) - sizeof("OFfb ")); - fix->id[sizeof(fix->id) - 1] = '\0'; + if (name) { + strcpy(fix->id, "OFfb "); + strncat(fix->id, name, sizeof(fix->id) - sizeof("OFfb ")); + fix->id[sizeof(fix->id) - 1] = '\0'; + } else + snprintf(fix->id, sizeof(fix->id), "OFfb %pOFn", dp); + var->xres = var->xres_virtual = width; var->yres = var->yres_virtual = height; @@ -644,7 +648,7 @@ static void __init offb_init_nodriver(struct device_node *dp, int no_real_node) /* kludge for valkyrie */ if (strcmp(dp->name, "valkyrie") == 0) address += 0x1000; - offb_init_fb(no_real_node ? "bootx" : dp->name, + offb_init_fb(no_real_node ? "bootx" : NULL, width, height, depth, pitch, address, foreign_endian, no_real_node ? NULL : dp); } diff --git a/drivers/video/fbdev/p9100.c b/drivers/video/fbdev/p9100.c index 64de5cda541d..c4283e9e95af 100644 --- a/drivers/video/fbdev/p9100.c +++ b/drivers/video/fbdev/p9100.c @@ -239,7 +239,7 @@ static int p9100_ioctl(struct fb_info *info, unsigned int cmd, static void p9100_init_fix(struct fb_info *info, int linebytes, struct device_node *dp) { - strlcpy(info->fix.id, dp->name, sizeof(info->fix.id)); + snprintf(info->fix.id, sizeof(info->fix.id), "%pOFn", dp); info->fix.type = FB_TYPE_PACKED_PIXELS; info->fix.visual = FB_VISUAL_PSEUDOCOLOR; diff --git a/drivers/video/of_display_timing.c b/drivers/video/of_display_timing.c index 5244e93ceafc..c2e7aa103fa5 100644 --- a/drivers/video/of_display_timing.c +++ b/drivers/video/of_display_timing.c @@ -170,7 +170,7 @@ struct display_timings *of_get_display_timings(const struct device_node *np) goto entryfail; } - pr_debug("%pOF: using %s as default timing\n", np, entry->name); + pr_debug("%pOF: using %pOFn as default timing\n", np, entry); native_mode = entry; -- 2.17.1