Merge tag 'powerpc-4.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[sfrench/cifs-2.6.git] / drivers / tty / hvc / hvc_vio.c

diff --git a/drivers/tty/hvc/hvc_vio.c b/drivers/tty/hvc/hvc_vio.c
index 6ffbdd8d50c51f10d1d75c4177d4d9a072a890d8..a1d272ac82bb49cc761df70b38ebc119ff5359e6 100644 (file)
--- a/drivers/tty/hvc/hvc_vio.c
+++ b/drivers/tty/hvc/hvc_vio.c
@@ -53,7 +53,7 @@
 
 static const char hvc_driver_name[] = "hvc_console";
 
-static struct vio_device_id hvc_driver_table[] = {
+static const struct vio_device_id hvc_driver_table[] = {
        {"serial", "hvterm1"},
 #ifndef HVC_OLD_HVSI
        {"serial", "hvterm-protocol"},
@@ -312,12 +312,12 @@ static int hvc_vio_probe(struct vio_dev *vdev,
                proto = HV_PROTOCOL_HVSI;
                ops = &hvterm_hvsi_ops;
        } else {
-               pr_err("hvc_vio: Unknown protocol for %s\n", vdev->dev.of_node->full_name);
+               pr_err("hvc_vio: Unknown protocol for %pOF\n", vdev->dev.of_node);
                return -ENXIO;
        }
 
-       pr_devel("hvc_vio_probe() device %s, using %s protocol\n",
-                vdev->dev.of_node->full_name,
+       pr_devel("hvc_vio_probe() device %pOF, using %s protocol\n",
+                vdev->dev.of_node,
                 proto == HV_PROTOCOL_RAW ? "raw" : "hvsi");
 
        /* Is it our boot one ? */