Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755260Ab2JDHzJ (ORCPT ); Thu, 4 Oct 2012 03:55:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:5902 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754732Ab2JDHzF (ORCPT ); Thu, 4 Oct 2012 03:55:05 -0400 Date: Thu, 4 Oct 2012 09:54:43 +0200 From: Alexander Gordeev To: Ingo Molnar Cc: linux-kernel@vger.kernel.org, Ingo Molnar , Thomas Gleixner , Bjorn Helgaas , Suresh Siddha , Yinghai Lu , Jeff Garzik , Matthew Wilcox , x86@kernel.org, linux-pci@vger.kernel.org, linux-ide@vger.kernel.org Subject: Re: [PATCH v3 -tip 1/5] x86, MSI: Support multiple MSIs in presense of IRQ remapping Message-ID: <20121004075442.GD2258@dhcp-26-207.brq.redhat.com> References: <20121002045518.GA7756@gmail.com> <20121002110630.GA2258@dhcp-26-207.brq.redhat.com> <20121002112524.GA12420@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20121002112524.GA12420@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2641 Lines: 77 On Tue, Oct 02, 2012 at 01:25:24PM +0200, Ingo Molnar wrote: > > > > @@ -584,8 +586,12 @@ int __irq_alloc_descs(int irq, unsigned int from, unsigned int cnt, int node, > > > > #define irq_alloc_desc_from(from, node) \ > > > > irq_alloc_descs(-1, from, 1, node) > > > > > > > > +#define irq_alloc_descs_from(from, cnt, node) \ > > > > + irq_alloc_descs(-1, from, cnt, node) > > > > + > > > > > > Please use inlines instead of macros. Might transform the one > > > above it as well in the process. > > > > You mean here do not introduce irq_alloc_descs_from, but rather use > > irq_alloc_descs() directly? > > My suggestion is to add irq_alloc_descs_from() as a (very > simple) inline function and change irq_alloc_desc_from() to be > an inline function as well. These defines were added on purpose with commit ec53cf2 ("irq: don't put module.h into irq.h for tracking irqgen modules.") - the relevant hunk is below. I suppose we do not want to revert it? @@ -567,29 +567,21 @@ static inline struct msi_desc *irq_data_get_msi(struct irq_data *d) int __irq_alloc_descs(int irq, unsigned int from, unsigned int cnt, int node, struct module *owner); -static inline int irq_alloc_descs(int irq, unsigned int from, unsigned int cnt, - int node) -{ - return __irq_alloc_descs(irq, from, cnt, node, THIS_MODULE); -} +/* use macros to avoid needing export.h for THIS_MODULE */ +#define irq_alloc_descs(irq, from, cnt, node) \ + __irq_alloc_descs(irq, from, cnt, node, THIS_MODULE) -void irq_free_descs(unsigned int irq, unsigned int cnt); -int irq_reserve_irqs(unsigned int from, unsigned int cnt); +#define irq_alloc_desc(node) \ + irq_alloc_descs(-1, 0, 1, node) -static inline int irq_alloc_desc(int node) -{ - return irq_alloc_descs(-1, 0, 1, node); -} +#define irq_alloc_desc_at(at, node) \ + irq_alloc_descs(at, at, 1, node) -static inline int irq_alloc_desc_at(unsigned int at, int node) -{ - return irq_alloc_descs(at, at, 1, node); -} +#define irq_alloc_desc_from(from, node) \ + irq_alloc_descs(-1, from, 1, node) -static inline int irq_alloc_desc_from(unsigned int from, int node) -{ - return irq_alloc_descs(-1, from, 1, node); -} +void irq_free_descs(unsigned int irq, unsigned int cnt); +int irq_reserve_irqs(unsigned int from, unsigned int cnt); static inline void irq_free_desc(unsigned int irq) { -- Regards, Alexander Gordeev agordeev@redhat.com -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/