All of lore.kernel.org
 help / color / mirror / Atom feed
From: Arnd Bergmann <arnd@arndb.de>
To: alsa-devel@alsa-project.org
Cc: broonie@kernel.org, Jarkko Nikula <jarkko.nikula@linux.intel.com>,
	Liam Girdwood <lgirdwood@gmail.com>
Subject: [PATCH]  ASoC: fix snd_soc_jack_add_gpiods stub
Date: Tue, 27 May 2014 17:46:05 +0200	[thread overview]
Message-ID: <7602265.lTCp4nNe4p@wuerfel> (raw)

f025d3b9c64e1 ("ASoC: jack: Add support for GPIO descriptor defined jack
pins") added this new interface, but the stub function provided for
non-gpiolib builds was defined in the header file as a global function,
leading to lots of "multiple definition of `snd_soc_jack_add_gpiods'"
warnings.

This adds the obvious "static inline" annotation.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Jarkko Nikula <jarkko.nikula@linux.intel.com>

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 98dca42..559dc53 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -464,9 +464,9 @@ static inline int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
 	return 0;
 }
 
-int snd_soc_jack_add_gpiods(struct device *gpiod_dev,
-			    struct snd_soc_jack *jack,
-			    int count, struct snd_soc_jack_gpio *gpios)
+static inline int snd_soc_jack_add_gpiods(struct device *gpiod_dev,
+					  struct snd_soc_jack *jack,
+					  int count, struct snd_soc_jack_gpio *gpios)
 {
 	return 0;
 }

             reply	other threads:[~2014-05-27 15:46 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-27 15:46 Arnd Bergmann [this message]
2014-05-27 15:50 ` [PATCH] ASoC: fix snd_soc_jack_add_gpiods stub Mark Brown
2014-05-27 15:52   ` Arnd Bergmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7602265.lTCp4nNe4p@wuerfel \
    --to=arnd@arndb.de \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=jarkko.nikula@linux.intel.com \
    --cc=lgirdwood@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.