On Wed, Jun 18, 2014 at 12:16:53PM -0300, Fabio Estevam wrote: > From: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx> > > We can get rid of the 'ifdef' by using the IS_ENABLED() macro. > > Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxxxxxxxx> Applied with Jingoo and Mohit's acks to pci/host-designware for v3.17, thanks! > --- > drivers/pci/host/pcie-designware.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c > index 1eaf4df3..dc842fd 100644 > --- a/drivers/pci/host/pcie-designware.c > +++ b/drivers/pci/host/pcie-designware.c > @@ -497,9 +497,8 @@ int __init dw_pcie_host_init(struct pcie_port *pp) > > pci_common_init_dev(pp->dev, &dw_pci); > pci_assign_unassigned_resources(); > -#ifdef CONFIG_PCI_DOMAINS > - dw_pci.domain++; > -#endif > + if (IS_ENABLED(CONFIG_PCI_DOMAINS)) > + dw_pci.domain++; > > return 0; > } > -- > 1.8.3.2 > -- 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