Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cd9f427 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/misc' into for-linus 

* topic/misc:
  ALSA: Remove unneeded ifdef from sound/core.h
  ALSA: Remove struct snd_monitor_file from public sound/core.h
  ALSA: Release v1.0.21
parents 0f23c5cc b8c60ede

include/sound/core.h

+0 −13
Original line number Original line Diff line number Diff line
@@ -93,15 +93,6 @@ struct snd_device { 




#define snd_device(n) list_entry(n, struct snd_device, list)

#define snd_device(n) list_entry(n, struct snd_device, list)





/* monitor files for graceful shutdown (hotplug) */



struct snd_monitor_file {

	struct file *file;

	const struct file_operations *disconnected_f_op;

	struct list_head shutdown_list;	/* still need to shutdown */

	struct list_head list;	/* link of monitor files */

};



/* main structure for soundcard */

/* main structure for soundcard */





struct snd_card {

struct snd_card {
@@ -311,9 +302,7 @@ int snd_component_add(struct snd_card *card, const char *component); 
int snd_card_file_add(struct snd_card *card, struct file *file);

int snd_card_file_add(struct snd_card *card, struct file *file);

int snd_card_file_remove(struct snd_card *card, struct file *file);

int snd_card_file_remove(struct snd_card *card, struct file *file);





#ifndef snd_card_set_dev

#define snd_card_set_dev(card, devptr) ((card)->dev = (devptr))

#define snd_card_set_dev(card, devptr) ((card)->dev = (devptr))

#endif





/* device.c */

/* device.c */
@@ -438,12 +427,10 @@ static inline int __snd_bug_on(int cond) 




/* for easier backward-porting */

/* for easier backward-porting */

#if defined(CONFIG_GAMEPORT) || defined(CONFIG_GAMEPORT_MODULE)

#if defined(CONFIG_GAMEPORT) || defined(CONFIG_GAMEPORT_MODULE)

#ifndef gameport_set_dev_parent

#define gameport_set_dev_parent(gp,xdev) ((gp)->dev.parent = (xdev))

#define gameport_set_dev_parent(gp,xdev) ((gp)->dev.parent = (xdev))

#define gameport_set_port_data(gp,r) ((gp)->port_data = (r))

#define gameport_set_port_data(gp,r) ((gp)->port_data = (r))

#define gameport_get_port_data(gp) (gp)->port_data

#define gameport_get_port_data(gp) (gp)->port_data

#endif

#endif

#endif





/* PCI quirk list helper */

/* PCI quirk list helper */

struct snd_pci_quirk {

struct snd_pci_quirk {

include/sound/version.h

+1 −1
Original line number Original line Diff line number Diff line 
/* include/version.h */

/* include/version.h */

#define CONFIG_SND_VERSION "1.0.20"

#define CONFIG_SND_VERSION "1.0.21"

#define CONFIG_SND_DATE ""
 
#define CONFIG_SND_DATE ""

sound/core/init.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -31,6 +31,14 @@ 
#include <sound/control.h>

#include <sound/control.h>

#include <sound/info.h>

#include <sound/info.h>





/* monitor files for graceful shutdown (hotplug) */

struct snd_monitor_file {

	struct file *file;

	const struct file_operations *disconnected_f_op;

	struct list_head shutdown_list;	/* still need to shutdown */

	struct list_head list;	/* link of monitor files */

};



static DEFINE_SPINLOCK(shutdown_lock);

static DEFINE_SPINLOCK(shutdown_lock);

static LIST_HEAD(shutdown_files);

static LIST_HEAD(shutdown_files);