diff mbox series

[v2] ALSA: memalloc: declare snd_sgbuf_aligned_pages() unconditionally

Message ID 20180727162805.20785-1-pierre-louis.bossart@linux.intel.com (mailing list archive)
State New, archived
Headers show
Series [v2] ALSA: memalloc: declare snd_sgbuf_aligned_pages() unconditionally | expand

Commit Message

Pierre-Louis Bossart July 27, 2018, 4:28 p.m. UTC
Make this helper inline function available for all platforms. This
helps solve 0-day compilation issues when CONFIG_SND_DMA_SGBUF is not
defined.

Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
v2: add <asm/page.h> to solve compilation issue on ALPHA reported by 0-day

 include/sound/memalloc.h | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

Comments

Mark Brown July 28, 2018, 2:48 p.m. UTC | #1
On Fri, Jul 27, 2018 at 11:28:05AM -0500, Pierre-Louis Bossart wrote:
> Make this helper inline function available for all platforms. This
> helps solve 0-day compilation issues when CONFIG_SND_DMA_SGBUF is not
> defined.

Please do not submit new versions of already applied patches, please
submit incremental updates to the existing code.  Modifying existing
commits creates problems for other users building on top of those
commits so it's best practice to only change pubished git commits if
absolutely essential.
Takashi Iwai July 30, 2018, 6:48 a.m. UTC | #2
On Sat, 28 Jul 2018 16:48:43 +0200,
Mark Brown wrote:
> 
> On Fri, Jul 27, 2018 at 11:28:05AM -0500, Pierre-Louis Bossart wrote:
> > Make this helper inline function available for all platforms. This
> > helps solve 0-day compilation issues when CONFIG_SND_DMA_SGBUF is not
> > defined.
> 
> Please do not submit new versions of already applied patches, please
> submit incremental updates to the existing code.  Modifying existing
> commits creates problems for other users building on top of those
> commits so it's best practice to only change pubished git commits if
> absolutely essential.

I asked Pierre for resubmission in a couple of days ago since your
usual notification post wasn't sent / received for the v1 post by some
reason...

In anyway, I submitted the incremental fix now.


thanks,

Takashi
diff mbox series

Patch

diff --git a/include/sound/memalloc.h b/include/sound/memalloc.h
index 9c3db3dce32b..67561b997915 100644
--- a/include/sound/memalloc.h
+++ b/include/sound/memalloc.h
@@ -24,6 +24,8 @@ 
 #ifndef __SOUND_MEMALLOC_H
 #define __SOUND_MEMALLOC_H
 
+#include <asm/page.h>
+
 struct device;
 
 /*
@@ -67,6 +69,14 @@  struct snd_dma_buffer {
 	void *private_data;	/* private for allocator; don't touch */
 };
 
+/*
+ * return the pages matching with the given byte size
+ */
+static inline unsigned int snd_sgbuf_aligned_pages(size_t size)
+{
+	return (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
+}
+
 #ifdef CONFIG_SND_DMA_SGBUF
 /*
  * Scatter-Gather generic device pages
@@ -90,14 +100,6 @@  struct snd_sg_buf {
 	struct device *dev;
 };
 
-/*
- * return the pages matching with the given byte size
- */
-static inline unsigned int snd_sgbuf_aligned_pages(size_t size)
-{
-	return (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
-}
-
 /*
  * return the physical address at the corresponding offset
  */