diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-09-17 23:31:36 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2018-09-19 11:04:33 +0200 |
| commit | ab3fd3b9a801a9faa2619e2e65207e736f859a6d (patch) | |
| tree | f0a6425fe00ba440e966570e662e6ff9c738d230 /backport/backport-include/sound | |
| parent | 30a378636e473278ff65800b1fe58822e36d716c (diff) | |
backports: Remove unused parts
This removes parts which were only used by subsystems which are not
included in backports any more, for example media, bluetooth and
Ethernet.
The patches which are removed in this commit are not applied to the
kernel tree anyway with the default configuration because non of the
files get copied. The freezer, media, regulator and sound parts were
only used by the already removed media drivers. The flow dissector file
is not copied any more.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'backport/backport-include/sound')
| -rw-r--r-- | backport/backport-include/sound/core.h | 20 | ||||
| -rw-r--r-- | backport/backport-include/sound/pcm.h | 29 |
2 files changed, 0 insertions, 49 deletions
diff --git a/backport/backport-include/sound/core.h b/backport/backport-include/sound/core.h deleted file mode 100644 index 79f8b319..00000000 --- a/backport/backport-include/sound/core.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef _BACKPORT_SOUND_CORE_H -#define _BACKPORT_SOUND_CORE_H -#include_next <sound/core.h> - -#if LINUX_VERSION_IS_LESS(3,15,0) -#define snd_card_new LINUX_BACKPORT(snd_card_new) -static inline -int snd_card_new(struct device *parent, int idx, const char *xid, - struct module *module, int extra_size, - struct snd_card **card_ret) -{ - int ret; - - ret = snd_card_create(idx, xid, module, extra_size, card_ret); - snd_card_set_dev(*card_ret, parent); - return ret; -} -#endif - -#endif /* _BACKPORT_SOUND_CORE_H */ diff --git a/backport/backport-include/sound/pcm.h b/backport/backport-include/sound/pcm.h deleted file mode 100644 index d5794ef9..00000000 --- a/backport/backport-include/sound/pcm.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef __BACKPORT_SOUND_PCM_H -#define __BACKPORT_SOUND_PCM_H -#include_next <sound/pcm.h> -#include <linux/version.h> - -#if LINUX_VERSION_IS_LESS(3,19,0) -/** - * snd_pcm_stop_xrun - stop the running streams as XRUN - * @substream: the PCM substream instance - * - * This stops the given running substream (and all linked substreams) as XRUN. - * Unlike snd_pcm_stop(), this function takes the substream lock by itself. - * - * Return: Zero if successful, or a negative error code. - */ -static inline int snd_pcm_stop_xrun(struct snd_pcm_substream *substream) -{ - unsigned long flags; - int ret = 0; - - snd_pcm_stream_lock_irqsave(substream, flags); - if (snd_pcm_running(substream)) - ret = snd_pcm_stop(substream, SNDRV_PCM_STATE_XRUN); - snd_pcm_stream_unlock_irqrestore(substream, flags); - return ret; -} -#endif /* LINUX_VERSION_IS_LESS(3,19,0) */ - -#endif /* __BACKPORT_SOUND_PCM_H */ |