On Mon, 2015-01-06 at 08:05:42 UTC, Jiang Liu wrote: > Use irq_data access helper to access irq_data->msi_desc, so we could > move msi_desc from struct irq_data into struct irq_common_data later. > > Signed-off-by: Jiang Liu <jiang.liu@xxxxxxxxxxxxxxx> > --- > arch/powerpc/sysdev/xics/ics-opal.c | 2 +- > arch/powerpc/sysdev/xics/ics-rtas.c | 2 +- > > diff --git a/arch/powerpc/sysdev/xics/ics-opal.c b/arch/powerpc/sysdev/xics/ics-opal.c > index 3996393c254d..27c936c080a6 100644 > --- 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 > > diff --git a/arch/powerpc/sysdev/xics/ics-rtas.c b/arch/powerpc/sysdev/xics/ics-rtas.c > index e2665a9dfc0f..3854dd41558d 100644 > --- 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 */ These look OK. Though I would point out we already have 16 irq_foo_get_bar() accessors?! Acked-by: Michael Ellerman <mpe@xxxxxxxxxxxxxx> cheers -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
