treewide: Use helper function to access irq_data->msi_desc

[firefly-linux-kernel-4.4.55.git] / arch / powerpc / sysdev / xics / ics-rtas.c

diff --git a/arch/powerpc/sysdev/xics/ics-rtas.c b/arch/powerpc/sysdev/xics/ics-rtas.c
index bc81335b2cbccbef965e7262d8472de7826ecdbc..d1c625c4cc5a4081686f2c83f7d2f0a51dbdd53e 100644 (file)
--- a/arch/powerpc/sysdev/xics/ics-rtas.c
+++ b/arch/powerpc/sysdev/xics/ics-rtas.c
@@ -75,7 +75,7 @@ static unsigned int ics_rtas_startup(struct irq_data *d)
         * card, using the MSI mask bits. Firmware doesn't appear to unmask
         * at that level, so we do it here by hand.
         */
-       if (d->msi_desc)
+       if (irq_data_get_msi_desc(d))
                pci_msi_unmask_irq(d);
 #endif
        /* unmask it */
@@ -140,11 +140,8 @@ static int ics_rtas_set_affinity(struct irq_data *d,
 
        irq_server = xics_get_irq_server(d->irq, cpumask, 1);
        if (irq_server == -1) {
-               char cpulist[128];
-               cpumask_scnprintf(cpulist, sizeof(cpulist), cpumask);
-               printk(KERN_WARNING
-                       "%s: No online cpus in the mask %s for irq %d\n",
-                       __func__, cpulist, d->irq);
+               pr_warning("%s: No online cpus in the mask %*pb for irq %d\n",
+                          __func__, cpumask_pr_args(cpumask), d->irq);
                return -1;
        }