treewide: Use helper function to access irq_data->msi_desc

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

diff --git a/arch/powerpc/sysdev/xics/ics-opal.c b/arch/powerpc/sysdev/xics/ics-opal.c
index 4ba554ec8eaffefd4ea9353429604134c1e3b0cf..11ac964d51752f3ce4c55a9953b02e0ee9936e08 100644 (file)
--- a/arch/powerpc/sysdev/xics/ics-opal.c
+++ b/arch/powerpc/sysdev/xics/ics-opal.c
@@ -72,7 +72,7 @@ static unsigned int ics_opal_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
 
@@ -131,10 +131,8 @@ static int ics_opal_set_affinity(struct irq_data *d,
 
        wanted_server = xics_get_irq_server(d->irq, cpumask, 1);
        if (wanted_server < 0) {
-               char cpulist[128];
-               cpumask_scnprintf(cpulist, sizeof(cpulist), cpumask);
-               pr_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;
        }
        server = ics_opal_mangle_server(wanted_server);