These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / pcmcia / pcmcia_resource.c

diff --git a/kernel/drivers/pcmcia/pcmcia_resource.c b/kernel/drivers/pcmcia/pcmcia_resource.c
index e8c19de..34aad89 100644 (file)
--- a/kernel/drivers/pcmcia/pcmcia_resource.c
+++ b/kernel/drivers/pcmcia/pcmcia_resource.c
@@ -508,8 +508,7 @@ int pcmcia_enable_device(struct pcmcia_device *p_dev)
        s->socket.Vpp = p_dev->vpp;
        if (s->ops->set_socket(s, &s->socket)) {
                mutex_unlock(&s->ops_mutex);
-               dev_printk(KERN_WARNING, &p_dev->dev,
-                          "Unable to set socket state\n");
+               dev_warn(&p_dev->dev, "Unable to set socket state\n");
                return -EINVAL;
        }
 
@@ -736,13 +735,11 @@ __pcmcia_request_exclusive_irq(struct pcmcia_device *p_dev,
        ret = request_irq(p_dev->irq, handler, 0, p_dev->devname, p_dev->priv);
        if (ret) {
                ret = pcmcia_request_irq(p_dev, handler);
-               dev_printk(KERN_WARNING, &p_dev->dev, "pcmcia: "
-                       "request for exclusive IRQ could not be fulfilled.\n");
-               dev_printk(KERN_WARNING, &p_dev->dev, "pcmcia: the driver "
-                       "needs updating to supported shared IRQ lines.\n");
+               dev_warn(&p_dev->dev, "pcmcia: request for exclusive IRQ could not be fulfilled\n");
+               dev_warn(&p_dev->dev, "pcmcia: the driver needs updating to supported shared IRQ lines\n");
        }
        if (ret)
-               dev_printk(KERN_INFO, &p_dev->dev, "request_irq() failed\n");
+               dev_info(&p_dev->dev, "request_irq() failed\n");
        else
                p_dev->_irq = 1;