From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757294Ab3C2XOF (ORCPT ); Fri, 29 Mar 2013 19:14:05 -0400 Received: from mga03.intel.com ([143.182.124.21]:56202 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757238Ab3C2XOD (ORCPT ); Fri, 29 Mar 2013 19:14:03 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.87,375,1363158000"; d="scan'208";a="220407098" Date: Sat, 30 Mar 2013 04:17:20 +0530 From: Vinod Koul To: Lars-Peter Clausen Cc: Dan Williams , linux-kernel@vger.kernel.org Subject: Re: [PATCH] dma: Make the 'mask' parameter of __dma_request_channel const Message-ID: <20130329224720.GB10326@intel.com> References: <1364214232-30078-1-git-send-email-lars@metafoo.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1364214232-30078-1-git-send-email-lars@metafoo.de> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Mar 25, 2013 at 01:23:52PM +0100, Lars-Peter Clausen wrote: > The 'mask' parameter is not modified in __dma_request_channel and really > shouldn't be. Make this explicit by making the parameter const. > > Signed-off-by: Lars-Peter Clausen Applied thanks. I manually fixed a conflict in dmaengine.h. Did you generate this on -next? > --- > drivers/dma/dmaengine.c | 9 ++++++--- > include/linux/dmaengine.h | 11 ++++++----- > 2 files changed, 12 insertions(+), 8 deletions(-) > > diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c > index b2728d6..d07ef7d 100644 > --- a/drivers/dma/dmaengine.c > +++ b/drivers/dma/dmaengine.c > @@ -174,7 +174,8 @@ static struct class dma_devclass = { > #define dma_device_satisfies_mask(device, mask) \ > __dma_device_satisfies_mask((device), &(mask)) > static int > -__dma_device_satisfies_mask(struct dma_device *device, dma_cap_mask_t *want) > +__dma_device_satisfies_mask(struct dma_device *device, > + const dma_cap_mask_t *want) > { > dma_cap_mask_t has; > > @@ -463,7 +464,8 @@ static void dma_channel_rebalance(void) > } > } > > -static struct dma_chan *private_candidate(dma_cap_mask_t *mask, struct dma_device *dev, > +static struct dma_chan *private_candidate(const dma_cap_mask_t *mask, > + struct dma_device *dev, > dma_filter_fn fn, void *fn_param) > { > struct dma_chan *chan; > @@ -505,7 +507,8 @@ static struct dma_chan *private_candidate(dma_cap_mask_t *mask, struct dma_devic > * @fn: optional callback to disposition available channels > * @fn_param: opaque parameter to pass to dma_filter_fn > */ > -struct dma_chan *__dma_request_channel(dma_cap_mask_t *mask, dma_filter_fn fn, void *fn_param) > +struct dma_chan *__dma_request_channel(const dma_cap_mask_t *mask, > + dma_filter_fn fn, void *fn_param) > { > struct dma_device *device, *_d; > struct dma_chan *chan = NULL; > diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h > index 91ac8da..2511742 100644 > --- a/include/linux/dmaengine.h > +++ b/include/linux/dmaengine.h > @@ -967,8 +967,9 @@ enum dma_status dma_sync_wait(struct dma_chan *chan, dma_cookie_t cookie); > #ifdef CONFIG_DMA_ENGINE > enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx); > void dma_issue_pending_all(void); > -struct dma_chan *__dma_request_channel(dma_cap_mask_t *mask, dma_filter_fn fn, void *fn_param); > struct dma_chan *dma_request_slave_channel(struct device *dev, char *name); > +struct dma_chan *__dma_request_channel(const dma_cap_mask_t *mask, > + dma_filter_fn fn, void *fn_param); > void dma_release_channel(struct dma_chan *chan); > #else > static inline enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx) > @@ -978,7 +979,7 @@ static inline enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descript > static inline void dma_issue_pending_all(void) > { > } > -static inline struct dma_chan *__dma_request_channel(dma_cap_mask_t *mask, > +static inline struct dma_chan *__dma_request_channel(const dma_cap_mask_t *mask, > dma_filter_fn fn, void *fn_param) > { > return NULL; > @@ -1005,9 +1006,9 @@ struct dma_chan *net_dma_find_channel(void); > __dma_request_slave_channel_compat(&(mask), x, y, dev, name) > > static inline struct dma_chan > -*__dma_request_slave_channel_compat(dma_cap_mask_t *mask, dma_filter_fn fn, > - void *fn_param, struct device *dev, > - char *name) > +*__dma_request_slave_channel_compat(const dma_cap_mask_t *mask, > + dma_filter_fn fn, void *fn_param, > + struct device *dev, char *name) > { > struct dma_chan *chan; > > -- > 1.8.0 >