Changeset 679 for GPL/trunk/alsa-kernel/include/sound/hwdep.h

Timestamp:

Mar 18, 2021, 8:57:36 PM (4 years ago)

Author:

David Azarewicz

Message:

Merge changes from Paul's uniaud32next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/include/sound/hwdep.h (modified) (5 diffs)

GPL/trunk/alsa-kernel/include/sound/hwdep.h

@@ +1 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 #ifndef __SOUND_HWDEP_H
 #define __SOUND_HWDEP_H
@@ -5 +6 @@
  *  Hardware dependent layer 
  *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
- *
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
  */
 
@@ -38 +23 @@
         int (*open)(struct snd_hwdep *hw, struct file * file);
         int (*release)(struct snd_hwdep *hw, struct file * file);
-        unsigned int (*poll)(struct snd_hwdep *hw, struct file *file,
+        __poll_t (*poll)(struct snd_hwdep *hw, struct file *file,
                              poll_table *wait);
         int (*ioctl)(struct snd_hwdep *hw, struct file *file,
@@ -61 +46 @@
 
 #ifdef CONFIG_SND_OSSEMUL
-        char oss_dev[32];
         int oss_type;
         int ossreg;
@@ -70 +54 @@
         void *private_data;
         void (*private_free) (struct snd_hwdep *hwdep);
+        struct device dev;
 
         struct mutex open_mutex;